Merge pull request #56 from benchdoos/rc/v2.0.1

rc/v2.0.1
benchdoos · Oct 22, 2023 · b7f7a1f · b7f7a1f
2 parents cc227e1 + df26535
commit b7f7a1f
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 10 deletions.
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -18,6 +18,9 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    outputs:
+      WEBLOCOPENERCORE_HASH: ${{ steps.weblocopenercore_hash.outputs.WEBLOCOPENERCORE_HASH }}
+      WEBLOCOPENER_HASH: ${{ steps.weblocopener_hash.outputs.WEBLOCOPENER_HASH }}
     steps:
     - uses: actions/checkout@v3
     - name: Set up JDK 17
@@ -51,9 +54,22 @@ jobs:
         ls -a
         mvn -B clean install -P hide-ultimate-mode
 
+    - name: Get commit hash for WeblocOpenerCore
+      id: weblocopenercore_hash
+      run: |
+        cd weblocopenercore
+        echo "WEBLOCOPENERCORE_HASH=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+        echo WeblocOpenerCore hash: $WEBLOCOPENER_HASH
+
     - name: Build WeblocOpener
       run: mvn -B clean package -P build-setup,build-deb,build-exe --file pom.xml
 
+    - name: Get commit hash for WeblocOpener
+      id: weblocopener_hash
+      run: |
+        echo "WEBLOCOPENER_HASH=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
+        echo WeblocOpener hash: $WEBLOCOPENER_HASH
+
     - name: Upload WeblocOpener.deb
       uses: actions/upload-artifact@v2
       with:
@@ -91,21 +107,34 @@ jobs:
           name: WeblocOpenerSetup.exe
           path: ${{ github.workspace }}
 
-      - name: Watching
-        run: |
-          echo directories:
-          find . -type d -print
-          echo files:
-          find . -type f -print
+#      - name: Watching
+#        run: |
+#          echo directories:
+#          find . -type d -print
+#          echo files:
+#          find . -type f -print
 
-      - name: Create Draft Release
+      - name: Echo files
         run: |
           echo current location: $PWD
           ls -a
+      - name: Echo variables
+        run: |
           RELEASE_NAME=rc-${GITHUB_REF#refs/heads/}-build.$BUILD_ID
           RELEASE_TAG=${GITHUB_REF#refs/heads/}-build.$BUILD_ID
           echo Release name: $RELEASE_NAME
-          gh release create $RELEASE_TAG WeblocOpener.deb WeblocOpenerSetup.exe --title "Build release: $RELEASE_NAME" --notes "Build: $RELEASE_TAG" --draft --prerelease
+          echo Just from outputs: "${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }} | ${{ needs.build.outputs.WEBLOCOPENER_HASH }}"
+
+      - name: Create Draft Release
+        run: |
+          WEBLOCOPENERCORE_HASH=${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }}
+          WEBLOCOPENER_HASH=${{ needs.build.outputs.WEBLOCOPENER_HASH }}
+          echo "WeblocOpenerCore hash: $WEBLOCOPENERCORE_HASH"
+          echo "WeblocOpener hash: $WEBLOCOPENER_HASH" 
+          RELEASE_DATE=$(date +'%Y-%m-%d %H:%M:%S')
+          RELEASE_NAME="WeblocOpener ${GITHUB_REF#refs/heads/}-build.$BUILD_ID"
+          RELEASE_TAG=${GITHUB_REF#refs/heads/}-build.$WEBLOCOPENER_HASH
+          gh release create $RELEASE_TAG WeblocOpener.deb WeblocOpenerSetup.exe --title "$RELEASE_NAME" --notes "Build: $RELEASE_TAG (github build: $BUILD_ID) <br><br><br> WeblocOpener: ${{ needs.build.outputs.WEBLOCOPENER_HASH }} <br> WeblocOpenerCore: https://github.com/benchdoos/WeblocOpenerCore/commit/${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }}" --draft --prerelease
         env:
           GITHUB_TOKEN: ${{ secrets.WEBLOCOPENER_RELEASES }}
 

diff --git a/build/WeblocOpener.iss b/build/WeblocOpener.iss
@@ -103,7 +103,7 @@ begin
       if MsgBox(ExpandConstant('{cm:Warning}' #13#13 '{cm:Java17InstallWarning}'), mbConfirmation, MB_YESNO) = idYes then
         begin
           Result := false;
-          ShellExec('open', 'https://adoptium.net', '', '', SW_SHOWNORMAL, ewNoWait, ResultCode);
+          ShellExec('open', 'https://adoptium.net/marketplace/?arch=any&package=jre&version=17', '', '', SW_SHOWNORMAL, ewNoWait, ResultCode);
         end;
     end
   else
@@ -221,6 +221,13 @@ Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CommandS
 Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CommandStore\shell\wo.OpenInVivaldi"; ValueType: string; ValueName: ""; ValueData: "Vivaldi"; Flags: uninsdeletevalue
 Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CommandStore\shell\wo.OpenInVivaldi\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""-open-browser"" ""vivaldi"" ""%1"" "; Flags: uninsdeletevalue
 
+Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CommandStore\shell\wo.OpenInBrave"; ValueType: string; ValueName: ""; ValueData: "Brave"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CommandStore\shell\wo.OpenInBrave\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""-open-browser"" ""brave"" ""%1"" "; Flags: uninsdeletevalue
+
+Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CommandStore\shell\wo.OpenInDuckDuckGo"; ValueType: string; ValueName: ""; ValueData: "DuckDuckGo"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CommandStore\shell\wo.OpenInDuckDuckGo\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""-open-browser"" ""duckduckgo"" ""%1"" "; Flags: uninsdeletevalue
+
+
 ;Adding select browser private
 Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CommandStore\shell\wo.OpenInChromePrivate"; ValueType: string; ValueName: ""; ValueData: "Incognito Google Chrome"; Flags: uninsdeletevalue
 Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CommandStore\shell\wo.OpenInChromePrivate\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""-open-browser"" ""chrome-private"" ""%1"" "; Flags: uninsdeletevalue
@@ -240,6 +247,10 @@ Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CommandS
 Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CommandStore\shell\wo.OpenInVivaldiPrivate"; ValueType: string; ValueName: ""; ValueData: "Private Vivaldi"; Flags: uninsdeletevalue
 Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CommandStore\shell\wo.OpenInVivaldiPrivate\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""-open-browser"" ""vivaldi-private"" ""%1"" "; Flags: uninsdeletevalue
 
+Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CommandStore\shell\wo.OpenInBravePrivate"; ValueType: string; ValueName: ""; ValueData: "InPrivate Brave"; Flags: uninsdeletevalue
+Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\CommandStore\shell\wo.OpenInBravePrivate\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""-open-browser"" ""brave-private"" ""%1"" "; Flags: uninsdeletevalue
+
+
 ;---/Add open in browser submenu---
 ; Add updater autorun
 Root: HKCU; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: string; ValueName: "Update"; ValueData: """start weblocopener -update-silent"""; Flags: uninsdeletevalue

diff --git a/pom.xml b/pom.xml
@@ -39,7 +39,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <java.version>17</java.version>
-    <weblocopener.core.version>2.0.0</weblocopener.core.version>
+    <weblocopener.core.version>2.0.1</weblocopener.core.version>
     <copyright>Copyright © 2016-2023 Eugene Zrazhevsky</copyright>
     <org.mapstruct.version>1.5.3.Final</org.mapstruct.version>
     <lombok.version>1.18.26</lombok.version>