From 13a81b484235ddf98152986da970721a155b6a9b Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Tue, 17 Oct 2023 21:07:03 +0300 Subject: [PATCH 01/21] weblocopenercore-303 No file menu elements for Brave and DuckDuckGo browsers: Added context menu items --- build/WeblocOpener.iss | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/build/WeblocOpener.iss b/build/WeblocOpener.iss index 99ceeead..067730d7 100644 --- a/build/WeblocOpener.iss +++ b/build/WeblocOpener.iss @@ -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: "Private 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 From 151d274f49c306c349acc6e98d4ae62ebeb4b196 Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Tue, 17 Oct 2023 21:33:14 +0300 Subject: [PATCH 02/21] weblocopenercore-303 No file menu elements for Brave and DuckDuckGo browsers: Fixed name --- build/WeblocOpener.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/WeblocOpener.iss b/build/WeblocOpener.iss index 067730d7..e67b0a5e 100644 --- a/build/WeblocOpener.iss +++ b/build/WeblocOpener.iss @@ -247,7 +247,7 @@ 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: "Private Brave"; 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 From d35eb412a6cbc4e68e5f6eac33127037a7faa3ee Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sat, 21 Oct 2023 17:44:14 +0300 Subject: [PATCH 03/21] weblocopenercore-305 [Feedback] Java 17 preinstall: changed url to download page --- build/WeblocOpener.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/WeblocOpener.iss b/build/WeblocOpener.iss index e67b0a5e..7aa16928 100644 --- 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 From 6e9a5d0b9c97587d9d48517460a317fa3e855fb6 Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sat, 21 Oct 2023 18:16:09 +0300 Subject: [PATCH 04/21] hotfix/version: updated version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 37fc24cf..ce748c58 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ UTF-8 UTF-8 17 - 2.0.0 + 2.0.1 Copyright © 2016-2023 Eugene Zrazhevsky 1.5.3.Final 1.18.26 From 25b87c4129bd7ade8e7c2a40da063f825df60daf Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sat, 21 Oct 2023 18:48:23 +0300 Subject: [PATCH 05/21] Added commits to release page --- .github/workflows/maven.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 9f5d4ae8..90e25709 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -51,9 +51,19 @@ jobs: ls -a mvn -B clean install -P hide-ultimate-mode + - name: Get commit hash for WeblocOpenerCore + run: | + export WEBLOCOPENER_CORE_COMMIT=$(git rev-parse HEAD) + echo "WEBLOCOPENER_CORE_COMMIT=$WEBLOCOPENER_CORE_COMMIT" >> $GITHUB_ENV + - name: Build WeblocOpener run: mvn -B clean package -P build-setup,build-deb,build-exe --file pom.xml + - name: Get commit hash for WeblocOpener + run: | + export WEBLOCOPENER_COMMIT=$(git rev-parse HEAD) + echo "WEBLOCOPENER_COMMIT=$WEBLOCOPENER_COMMIT" >> $GITHUB_ENV + - name: Upload WeblocOpener.deb uses: actions/upload-artifact@v2 with: @@ -105,7 +115,7 @@ jobs: 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 + gh release create $RELEASE_TAG WeblocOpener.deb WeblocOpenerSetup.exe --title "Build release: $RELEASE_NAME" --notes "Build: $RELEASE_TAG

WeblocOpener: $WEBLOCOPENER_COMMIT
WeblocOpenerCore: $WEBLOCOPENER_CORE_COMMIT" --draft --prerelease env: GITHUB_TOKEN: ${{ secrets.WEBLOCOPENER_RELEASES }} From 9030d72460843f4ea4779faeb8b9735a9825a50f Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sat, 21 Oct 2023 18:54:36 +0300 Subject: [PATCH 06/21] Trying to fix --- .github/workflows/maven.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 90e25709..e7633f8a 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -53,16 +53,14 @@ jobs: - name: Get commit hash for WeblocOpenerCore run: | - export WEBLOCOPENER_CORE_COMMIT=$(git rev-parse HEAD) - echo "WEBLOCOPENER_CORE_COMMIT=$WEBLOCOPENER_CORE_COMMIT" >> $GITHUB_ENV + echo "WEBLOCOPENER_CORE_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV - name: Build WeblocOpener run: mvn -B clean package -P build-setup,build-deb,build-exe --file pom.xml - name: Get commit hash for WeblocOpener run: | - export WEBLOCOPENER_COMMIT=$(git rev-parse HEAD) - echo "WEBLOCOPENER_COMMIT=$WEBLOCOPENER_COMMIT" >> $GITHUB_ENV + echo "WEBLOCOPENER_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV - name: Upload WeblocOpener.deb uses: actions/upload-artifact@v2 From 74b9f8842e8f0565d8a0715922bede356d9b8feb Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sat, 21 Oct 2023 18:56:28 +0300 Subject: [PATCH 07/21] Added time --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e7633f8a..bb9c4870 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -113,7 +113,7 @@ jobs: 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

WeblocOpener: $WEBLOCOPENER_COMMIT
WeblocOpenerCore: $WEBLOCOPENER_CORE_COMMIT" --draft --prerelease + gh release create $RELEASE_TAG WeblocOpener.deb WeblocOpenerSetup.exe --title "Build release: $RELEASE_NAME" --notes "Build: $(date +'%Y-%m-%d %H:%M:%S') ($RELEASE_TAG)

WeblocOpener: $WEBLOCOPENER_COMMIT
WeblocOpenerCore: $WEBLOCOPENER_CORE_COMMIT" --draft --prerelease env: GITHUB_TOKEN: ${{ secrets.WEBLOCOPENER_RELEASES }} From 22712e86f7d13a2acf411290ee4951d160cc15c9 Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sat, 21 Oct 2023 19:08:16 +0300 Subject: [PATCH 08/21] Trying fix hash --- .github/workflows/maven.yml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index bb9c4870..fb4f0054 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -52,13 +52,16 @@ jobs: mvn -B clean install -P hide-ultimate-mode - name: Get commit hash for WeblocOpenerCore + id: weblocopenercore_hash run: | echo "WEBLOCOPENER_CORE_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV + echo "::set-output name=WeblocOpenerCoreHash::${WEBLOCOPENER_CORE_COMMIT}" - 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_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV @@ -74,6 +77,10 @@ jobs: name: WeblocOpenerSetup.exe path: ${{ github.workspace }}/target/WeblocOpenerSetup.exe + outputs: + WeblocOpenerCoreHash: ${{steps.weblocopenercore_hash.outputs.WeblocOpenerCoreHash}} + WeblocOpenerHash: ${{steps.weblocopener_hash.outputs.WeblocOpenerHash}} + create-release: runs-on: ubuntu-latest @@ -112,8 +119,12 @@ jobs: ls -a RELEASE_NAME=rc-${GITHUB_REF#refs/heads/}-build.$BUILD_ID RELEASE_TAG=${GITHUB_REF#refs/heads/}-build.$BUILD_ID + WEBLOCOPENERCORE_HASH=${{needs.build.outputs.WeblocOpenerCoreHash}} + WEBLOCOPENER_HASH=${{needs.build.outputs.WeblocOpenerHash}} + echo WeblocOpenerCore hash: $WEBLOCOPENERCORE_HASH + echo WeblocOpener hash: $WEBLOCOPENER_HASH echo Release name: $RELEASE_NAME - gh release create $RELEASE_TAG WeblocOpener.deb WeblocOpenerSetup.exe --title "Build release: $RELEASE_NAME" --notes "Build: $(date +'%Y-%m-%d %H:%M:%S') ($RELEASE_TAG)

WeblocOpener: $WEBLOCOPENER_COMMIT
WeblocOpenerCore: $WEBLOCOPENER_CORE_COMMIT" --draft --prerelease + gh release create $RELEASE_TAG WeblocOpener.deb WeblocOpenerSetup.exe --title "Build release: $RELEASE_NAME" --notes "Build: $(date +'%Y-%m-%d %H:%M:%S') ($RELEASE_TAG)

WeblocOpener: $WEBLOCOPENER_HASH
WeblocOpenerCore: $WEBLOCOPENERCORE_HASH" --draft --prerelease env: GITHUB_TOKEN: ${{ secrets.WEBLOCOPENER_RELEASES }} From a45953fa38d52cc7705ac83d1bf3ebe42deaafc7 Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sat, 21 Oct 2023 19:14:42 +0300 Subject: [PATCH 09/21] Trying fix hash 2 --- .github/workflows/maven.yml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index fb4f0054..fe933dea 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -18,6 +18,9 @@ on: jobs: build: runs-on: ubuntu-latest + outputs: + WeblocOpenerCoreHash: WeblocOpenerCoreHashTest + WeblocOpenerHash: WeblocOpenerHashTest steps: - uses: actions/checkout@v3 - name: Set up JDK 17 @@ -53,17 +56,14 @@ jobs: - name: Get commit hash for WeblocOpenerCore id: weblocopenercore_hash - run: | - echo "WEBLOCOPENER_CORE_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV - echo "::set-output name=WeblocOpenerCoreHash::${WEBLOCOPENER_CORE_COMMIT}" + run: echo "WeblocOpenerCoreHash=$(git rev-parse HEAD) >> $GITHUB_OUTPUT" - 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_COMMIT=$(git rev-parse HEAD)" >> $GITHUB_ENV + run: echo "WeblocOpenerHash=$(git rev-parse HEAD) >> $GITHUB_OUTPUT" - name: Upload WeblocOpener.deb uses: actions/upload-artifact@v2 @@ -77,10 +77,6 @@ jobs: name: WeblocOpenerSetup.exe path: ${{ github.workspace }}/target/WeblocOpenerSetup.exe - outputs: - WeblocOpenerCoreHash: ${{steps.weblocopenercore_hash.outputs.WeblocOpenerCoreHash}} - WeblocOpenerHash: ${{steps.weblocopener_hash.outputs.WeblocOpenerHash}} - create-release: runs-on: ubuntu-latest From 4490a1d67702d84f32ec200ad4a83f21241a2061 Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sun, 22 Oct 2023 11:38:39 +0300 Subject: [PATCH 10/21] Trying fix hash 3 --- .github/workflows/maven.yml | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index fe933dea..ae6a1e6f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -18,9 +18,6 @@ on: jobs: build: runs-on: ubuntu-latest - outputs: - WeblocOpenerCoreHash: WeblocOpenerCoreHashTest - WeblocOpenerHash: WeblocOpenerHashTest steps: - uses: actions/checkout@v3 - name: Set up JDK 17 @@ -56,14 +53,16 @@ jobs: - name: Get commit hash for WeblocOpenerCore id: weblocopenercore_hash - run: echo "WeblocOpenerCoreHash=$(git rev-parse HEAD) >> $GITHUB_OUTPUT" + run: echo "WEBLOCOPENERCORE_HASH=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - 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 "WeblocOpenerHash=$(git rev-parse HEAD) >> $GITHUB_OUTPUT" + run: | + echo "WEBLOCOPENER_HASH=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT + echo $GITHUB_OUTPUT - name: Upload WeblocOpener.deb uses: actions/upload-artifact@v2 @@ -102,12 +101,15 @@ 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: Echo GITHUB_OUTPUT + run: echo $GITHUB_OUTPUT - name: Create Draft Release run: | @@ -115,8 +117,9 @@ jobs: ls -a RELEASE_NAME=rc-${GITHUB_REF#refs/heads/}-build.$BUILD_ID RELEASE_TAG=${GITHUB_REF#refs/heads/}-build.$BUILD_ID - WEBLOCOPENERCORE_HASH=${{needs.build.outputs.WeblocOpenerCoreHash}} - WEBLOCOPENER_HASH=${{needs.build.outputs.WeblocOpenerHash}} + WEBLOCOPENERCORE_HASH=${{needs.build.outputs.WEBLOCOPENERCORE_HASH}} + WEBLOCOPENER_HASH=${{needs.build.outputs.WEBLOCOPENER_HASH}} + echo Just from outputs: ${{needs.build.outputs.WEBLOCOPENERCORE_HASH}} | ${{needs.build.outputs.WEBLOCOPENER_HASH}} echo WeblocOpenerCore hash: $WEBLOCOPENERCORE_HASH echo WeblocOpener hash: $WEBLOCOPENER_HASH echo Release name: $RELEASE_NAME From 58acb883260f32e500a2d3e76a2d795115feb305 Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sun, 22 Oct 2023 11:54:37 +0300 Subject: [PATCH 11/21] Trying fix hash 4 --- .github/workflows/maven.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index ae6a1e6f..eb90d262 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -18,6 +18,9 @@ on: jobs: build: runs-on: ubuntu-latest + outputs: + WEBLOCOPENERCORE_HASH: test_WEBLOCOPENERCORE_HASH + WEBLOCOPENER_HASH: test_WEBLOCOPENER_HASH steps: - uses: actions/checkout@v3 - name: Set up JDK 17 @@ -62,6 +65,7 @@ jobs: id: weblocopener_hash run: | echo "WEBLOCOPENER_HASH=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT + echo ${{steps.weblocopenercore_hash.outputs.WEBLOCOPENERCORE_HASH}} echo $GITHUB_OUTPUT - name: Upload WeblocOpener.deb From d0d2eddd1cf2a267fe75bfd76bb4cbd47368358c Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sun, 22 Oct 2023 12:02:13 +0300 Subject: [PATCH 12/21] Trying fix hash 5 --- .github/workflows/maven.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index eb90d262..cb0b6781 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -19,8 +19,8 @@ jobs: build: runs-on: ubuntu-latest outputs: - WEBLOCOPENERCORE_HASH: test_WEBLOCOPENERCORE_HASH - WEBLOCOPENER_HASH: test_WEBLOCOPENER_HASH + 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 @@ -66,6 +66,7 @@ jobs: run: | echo "WEBLOCOPENER_HASH=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT echo ${{steps.weblocopenercore_hash.outputs.WEBLOCOPENERCORE_HASH}} + echo "::set-output name=WEBLOCOPENER_HASH::$(git rev-parse HEAD)" echo $GITHUB_OUTPUT - name: Upload WeblocOpener.deb @@ -123,7 +124,7 @@ jobs: RELEASE_TAG=${GITHUB_REF#refs/heads/}-build.$BUILD_ID WEBLOCOPENERCORE_HASH=${{needs.build.outputs.WEBLOCOPENERCORE_HASH}} WEBLOCOPENER_HASH=${{needs.build.outputs.WEBLOCOPENER_HASH}} - echo Just from outputs: ${{needs.build.outputs.WEBLOCOPENERCORE_HASH}} | ${{needs.build.outputs.WEBLOCOPENER_HASH}} + echo Just from outputs: ${{needs.build.outputs.WEBLOCOPENERCORE_HASH}} | ${{ needs.build.outputs.WEBLOCOPENER_HASH }} echo WeblocOpenerCore hash: $WEBLOCOPENERCORE_HASH echo WeblocOpener hash: $WEBLOCOPENER_HASH echo Release name: $RELEASE_NAME From 0d1121c006a76519c256a512083999304b1fcfe5 Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sun, 22 Oct 2023 12:10:40 +0300 Subject: [PATCH 13/21] Trying fix hash 6 --- .github/workflows/maven.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index cb0b6781..6fcad87b 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -63,11 +63,7 @@ jobs: - name: Get commit hash for WeblocOpener id: weblocopener_hash - run: | - echo "WEBLOCOPENER_HASH=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - echo ${{steps.weblocopenercore_hash.outputs.WEBLOCOPENERCORE_HASH}} - echo "::set-output name=WEBLOCOPENER_HASH::$(git rev-parse HEAD)" - echo $GITHUB_OUTPUT + run: echo "WEBLOCOPENER_HASH=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT - name: Upload WeblocOpener.deb uses: actions/upload-artifact@v2 @@ -122,11 +118,9 @@ jobs: ls -a RELEASE_NAME=rc-${GITHUB_REF#refs/heads/}-build.$BUILD_ID RELEASE_TAG=${GITHUB_REF#refs/heads/}-build.$BUILD_ID - WEBLOCOPENERCORE_HASH=${{needs.build.outputs.WEBLOCOPENERCORE_HASH}} - WEBLOCOPENER_HASH=${{needs.build.outputs.WEBLOCOPENER_HASH}} echo Just from outputs: ${{needs.build.outputs.WEBLOCOPENERCORE_HASH}} | ${{ needs.build.outputs.WEBLOCOPENER_HASH }} - echo WeblocOpenerCore hash: $WEBLOCOPENERCORE_HASH - echo WeblocOpener hash: $WEBLOCOPENER_HASH + echo WeblocOpenerCore hash: ${{needs.build.outputs.WEBLOCOPENERCORE_HASH}} + echo WeblocOpener hash: ${{ needs.build.outputs.WEBLOCOPENER_HASH }} echo Release name: $RELEASE_NAME gh release create $RELEASE_TAG WeblocOpener.deb WeblocOpenerSetup.exe --title "Build release: $RELEASE_NAME" --notes "Build: $(date +'%Y-%m-%d %H:%M:%S') ($RELEASE_TAG)

WeblocOpener: $WEBLOCOPENER_HASH
WeblocOpenerCore: $WEBLOCOPENERCORE_HASH" --draft --prerelease env: From 017da36aba6f101cbe9fc26b028a94af96514bd3 Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sun, 22 Oct 2023 12:15:40 +0300 Subject: [PATCH 14/21] Trying fix hash 7...? --- .github/workflows/maven.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 6fcad87b..eb0267a8 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -118,8 +118,8 @@ jobs: ls -a RELEASE_NAME=rc-${GITHUB_REF#refs/heads/}-build.$BUILD_ID RELEASE_TAG=${GITHUB_REF#refs/heads/}-build.$BUILD_ID - echo Just from outputs: ${{needs.build.outputs.WEBLOCOPENERCORE_HASH}} | ${{ needs.build.outputs.WEBLOCOPENER_HASH }} - echo WeblocOpenerCore hash: ${{needs.build.outputs.WEBLOCOPENERCORE_HASH}} + echo Just from outputs: "${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }} | ${{ needs.build.outputs.WEBLOCOPENER_HASH }}" + echo WeblocOpenerCore hash: ${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }} echo WeblocOpener hash: ${{ needs.build.outputs.WEBLOCOPENER_HASH }} echo Release name: $RELEASE_NAME gh release create $RELEASE_TAG WeblocOpener.deb WeblocOpenerSetup.exe --title "Build release: $RELEASE_NAME" --notes "Build: $(date +'%Y-%m-%d %H:%M:%S') ($RELEASE_TAG)

WeblocOpener: $WEBLOCOPENER_HASH
WeblocOpenerCore: $WEBLOCOPENERCORE_HASH" --draft --prerelease From 74a4366add896b1c8a7d9149024916c391d761a9 Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sun, 22 Oct 2023 12:21:50 +0300 Subject: [PATCH 15/21] Trying fix hash 8 --- .github/workflows/maven.yml | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index eb0267a8..447a5d00 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -109,20 +109,22 @@ jobs: # echo files: # find . -type f -print - - name: Echo GITHUB_OUTPUT - run: echo $GITHUB_OUTPUT - - - name: Create Draft Release + - name: Echo files run: | echo current location: $PWD - ls -a + 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 echo Just from outputs: "${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }} | ${{ needs.build.outputs.WEBLOCOPENER_HASH }}" + + - name: Create Draft Release + run: | echo WeblocOpenerCore hash: ${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }} echo WeblocOpener hash: ${{ needs.build.outputs.WEBLOCOPENER_HASH }} - echo Release name: $RELEASE_NAME - gh release create $RELEASE_TAG WeblocOpener.deb WeblocOpenerSetup.exe --title "Build release: $RELEASE_NAME" --notes "Build: $(date +'%Y-%m-%d %H:%M:%S') ($RELEASE_TAG)

WeblocOpener: $WEBLOCOPENER_HASH
WeblocOpenerCore: $WEBLOCOPENERCORE_HASH" --draft --prerelease + gh release create $RELEASE_TAG WeblocOpener.deb WeblocOpenerSetup.exe --title "Build release: $RELEASE_NAME" --notes "Build: $(date +'%Y-%m-%d %H:%M:%S') ($RELEASE_TAG)

WeblocOpener: ${{ needs.build.outputs.WEBLOCOPENER_HASH }}
WeblocOpenerCore: ${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }}" --draft --prerelease env: GITHUB_TOKEN: ${{ secrets.WEBLOCOPENER_RELEASES }} From c8e8b1b74c4029597a490e51b36b1c81fd270501 Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sun, 22 Oct 2023 12:24:29 +0300 Subject: [PATCH 16/21] Trying fix hash 9 --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 447a5d00..b09e022f 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -112,7 +112,7 @@ jobs: - name: Echo files run: | echo current location: $PWD - ls-a + ls -a - name: Echo variables run: | RELEASE_NAME=rc-${GITHUB_REF#refs/heads/}-build.$BUILD_ID From 0e47156cfe70c7e1a59f9d423a6eed7eb18ea4d0 Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sun, 22 Oct 2023 12:31:12 +0300 Subject: [PATCH 17/21] Trying fix hash 10 --- .github/workflows/maven.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index b09e022f..e3932052 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -124,6 +124,7 @@ jobs: run: | echo WeblocOpenerCore hash: ${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }} echo WeblocOpener hash: ${{ needs.build.outputs.WEBLOCOPENER_HASH }} + RELEASE_TAG=${GITHUB_REF#refs/heads/}-build.$BUILD_ID gh release create $RELEASE_TAG WeblocOpener.deb WeblocOpenerSetup.exe --title "Build release: $RELEASE_NAME" --notes "Build: $(date +'%Y-%m-%d %H:%M:%S') ($RELEASE_TAG)

WeblocOpener: ${{ needs.build.outputs.WEBLOCOPENER_HASH }}
WeblocOpenerCore: ${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }}" --draft --prerelease env: GITHUB_TOKEN: ${{ secrets.WEBLOCOPENER_RELEASES }} From 319dd6beb190b482776799902345561cefccd2a6 Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sun, 22 Oct 2023 16:04:45 +0300 Subject: [PATCH 18/21] Trying fix hash 11 --- .github/workflows/maven.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index e3932052..16f94838 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -124,6 +124,7 @@ jobs: run: | echo WeblocOpenerCore hash: ${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }} echo WeblocOpener hash: ${{ needs.build.outputs.WEBLOCOPENER_HASH }} + RELEASE_NAME=rc-${GITHUB_REF#refs/heads/}-build.$BUILD_ID RELEASE_TAG=${GITHUB_REF#refs/heads/}-build.$BUILD_ID gh release create $RELEASE_TAG WeblocOpener.deb WeblocOpenerSetup.exe --title "Build release: $RELEASE_NAME" --notes "Build: $(date +'%Y-%m-%d %H:%M:%S') ($RELEASE_TAG)

WeblocOpener: ${{ needs.build.outputs.WEBLOCOPENER_HASH }}
WeblocOpenerCore: ${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }}" --draft --prerelease env: From 6e984b1c4ab32148d86dbfba3e802bca107f9d1d Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sun, 22 Oct 2023 16:06:53 +0300 Subject: [PATCH 19/21] Trying fix hash 12 --- .github/workflows/maven.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 16f94838..65b704bf 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -56,14 +56,19 @@ jobs: - name: Get commit hash for WeblocOpenerCore id: weblocopenercore_hash - run: echo "WEBLOCOPENERCORE_HASH=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT + 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 + run: | + echo "WEBLOCOPENER_HASH=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT + echo WeblocOpener hash: $WEBLOCOPENER_HASH - name: Upload WeblocOpener.deb uses: actions/upload-artifact@v2 From 4f8f2d5b122182df880de6701d4693e6b400ce86 Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sun, 22 Oct 2023 16:18:59 +0300 Subject: [PATCH 20/21] Updated release notes --- .github/workflows/maven.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 65b704bf..5372f615 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -127,11 +127,14 @@ jobs: - name: Create Draft Release run: | - echo WeblocOpenerCore hash: ${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }} - echo WeblocOpener hash: ${{ needs.build.outputs.WEBLOCOPENER_HASH }} - RELEASE_NAME=rc-${GITHUB_REF#refs/heads/}-build.$BUILD_ID - RELEASE_TAG=${GITHUB_REF#refs/heads/}-build.$BUILD_ID - gh release create $RELEASE_TAG WeblocOpener.deb WeblocOpenerSetup.exe --title "Build release: $RELEASE_NAME" --notes "Build: $(date +'%Y-%m-%d %H:%M:%S') ($RELEASE_TAG)

WeblocOpener: ${{ needs.build.outputs.WEBLOCOPENER_HASH }}
WeblocOpenerCore: ${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }}" --draft --prerelease + 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.$WEBLOCOPENER_HASH" + 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)


WeblocOpener: ${{ needs.build.outputs.WEBLOCOPENER_HASH }}
WeblocOpenerCore: https://github.com/benchdoos/WeblocOpenerCore/commit/${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }}" --draft --prerelease env: GITHUB_TOKEN: ${{ secrets.WEBLOCOPENER_RELEASES }} From df26535d2af97986735b0d3da3e840bf15567e00 Mon Sep 17 00:00:00 2001 From: Eugene Zrazhevsky Date: Sun, 22 Oct 2023 16:22:35 +0300 Subject: [PATCH 21/21] Fixed name --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 5372f615..ccfbe099 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -132,7 +132,7 @@ jobs: 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.$WEBLOCOPENER_HASH" + 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)


WeblocOpener: ${{ needs.build.outputs.WEBLOCOPENER_HASH }}
WeblocOpenerCore: https://github.com/benchdoos/WeblocOpenerCore/commit/${{ needs.build.outputs.WEBLOCOPENERCORE_HASH }}" --draft --prerelease env: