From 97e508cd596e874374346ac45a88048ee8d6e1cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claudio=20Andr=C3=A9?= Date: Mon, 18 Nov 2024 22:04:37 -0300 Subject: [PATCH] ci: set the value of 'pin commit' to `f8e9ca1` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Claudio André --- .github/workflows/docker.yml | 2 +- deploy/Mac_ARM-Delivery.yml | 2 +- deploy/Solaris-Delivery.yml | 2 +- deploy/Windows-Delivery.yml | 4 ++-- deploy/flatpak/com.openwall.John.json | 2 +- deploy/snap/snapcraft.yaml | 2 +- docs/newsletter.md | 2 +- docs/release-process.md | 4 ++-- requirements.hash | 1 + 9 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 02dbe858..c44effc3 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -153,7 +153,7 @@ jobs: }} build-args: | TYPE=ALL - RELEASE_COMMIT=f9fedd238b0b1d69181c1fef033b85c787e96e57 + RELEASE_COMMIT=f8e9ca1eac15e25170d21b77e66ec77efa0b7d0d tags: ${{ steps.data.outputs.image_tags }} labels: | ${{ steps.meta.outputs.labels }} diff --git a/deploy/Mac_ARM-Delivery.yml b/deploy/Mac_ARM-Delivery.yml index d59a3fd3..c94235d3 100644 --- a/deploy/Mac_ARM-Delivery.yml +++ b/deploy/Mac_ARM-Delivery.yml @@ -37,7 +37,7 @@ macOS_task: TEST: "macOS;" BASE: "Apple macOS M2" DEPLOY_PAK: "Yes" - RELEASE_COMMIT: "f9fedd238b0b1d69181c1fef033b85c787e96e57" + RELEASE_COMMIT: "f8e9ca1eac15e25170d21b77e66ec77efa0b7d0d" info_script: | git clone --depth 10 https://github.com/openwall/john.git ~/tmp diff --git a/deploy/Solaris-Delivery.yml b/deploy/Solaris-Delivery.yml index 421b7ee4..03fdc5d6 100644 --- a/deploy/Solaris-Delivery.yml +++ b/deploy/Solaris-Delivery.yml @@ -29,7 +29,7 @@ name: Solaris CI hash: description: "The commit hash to be used" required: false - default: "f9fedd238b0b1d69181c1fef033b85c787e96e57" + default: "f8e9ca1eac15e25170d21b77e66ec77efa0b7d0d" jobs: test: diff --git a/deploy/Windows-Delivery.yml b/deploy/Windows-Delivery.yml index f642e2d2..8819c906 100644 --- a/deploy/Windows-Delivery.yml +++ b/deploy/Windows-Delivery.yml @@ -33,7 +33,7 @@ steps: cd $env:BUILD_FOLDER # Force the build to be repeatable - git checkout "f9fedd238b0b1d69181c1fef033b85c787e96e57" + git checkout "f8e9ca1eac15e25170d21b77e66ec77efa0b7d0d" Write-Host "--------------------------------------------------------" Write-Host " ===== Deploying the release $RELEASE_COMMIT ===== " -ForegroundColor White @@ -125,7 +125,7 @@ steps: shell "echo '#' >> ../run/Defaults" shell "echo '# The john (upstream) repository reference' >> ../run/Defaults" shell "echo '[Repository john]' >> ../run/Defaults" - shell "echo 'Commit=f9fedd238b0b1d69181c1fef033b85c787e96e57' >> ../run/Defaults" + shell "echo 'Commit=f8e9ca1eac15e25170d21b77e66ec77efa0b7d0d' >> ../run/Defaults" # Use symlink.c to produce a tiny john.exe that executes the best SIMD shell "make windows-tiny-link-to-john MAIN_NAME=$EXE_NAME " diff --git a/deploy/flatpak/com.openwall.John.json b/deploy/flatpak/com.openwall.John.json index 3bd9f8d2..f3fa5307 100644 --- a/deploy/flatpak/com.openwall.John.json +++ b/deploy/flatpak/com.openwall.John.json @@ -100,7 +100,7 @@ { "type": "git", "url": "https://github.com/openwall/john.git", - "commit": "f9fedd238b0b1d69181c1fef033b85c787e96e57" + "commit": "f8e9ca1eac15e25170d21b77e66ec77efa0b7d0d" }, { "type": "file", diff --git a/deploy/snap/snapcraft.yaml b/deploy/snap/snapcraft.yaml index 7c9c22b7..975364c4 100644 --- a/deploy/snap/snapcraft.yaml +++ b/deploy/snap/snapcraft.yaml @@ -95,7 +95,7 @@ parts: plugin: nil after: [john-packages] source: https://github.com/openwall/john.git - source-commit: f9fedd238b0b1d69181c1fef033b85c787e96e57 + source-commit: f8e9ca1eac15e25170d21b77e66ec77efa0b7d0d source-depth: 10 override-build: | diff --git a/docs/newsletter.md b/docs/newsletter.md index dd3d5904..9822a069 100644 --- a/docs/newsletter.md +++ b/docs/newsletter.md @@ -50,4 +50,4 @@ Also: ## Recommendation Install (or update your installation to) `1.9.1-ce` or to the upstream commit -[f9fedd2](https://github.com/openwall/john/commit/f9fedd238b0b1d69181c1fef033b85c787e96e57). +[f8e9ca1](https://github.com/openwall/john/commit/f8e9ca1eac15e25170d21b77e66ec77efa0b7d0d). diff --git a/docs/release-process.md b/docs/release-process.md index 3d1c8a2e..a875d575 100644 --- a/docs/release-process.md +++ b/docs/release-process.md @@ -31,8 +31,8 @@ not use it for day by day tasks, which, by the way, is exactly what is happening - [ ] Add a new commit to the `release` branch; - This is the "pin upstream commit". - [ ] Update the commit that will be used to build; - - Replace all occurrences of `f9fedd238b0b1d69181c1fef033b85c787e96e57` with the proper commit hash; - - Replace all occurrences of `f9fedd2` with the proper short commit hash; + - Replace all occurrences of `f8e9ca1eac15e25170d21b77e66ec77efa0b7d0d` with the proper commit hash; + - Replace all occurrences of `f8e9ca1` with the proper short commit hash; - Update bash script [file hashes](../CONTRIBUTING.md#create-a-suitable-pr); - Amend and push the "pin upstream commit". diff --git a/requirements.hash b/requirements.hash index 2542f1ca..110b7e9d 100644 --- a/requirements.hash +++ b/requirements.hash @@ -7,3 +7,4 @@ ad0a8ec80ac460df49a2643a5ea75c98ebe55e6039515ff3b8fc581c974ba698 ./run_tests.sh 94b462117f4a77f14703c5774a8477dcf6644bfee75bec158c0407e69ba58c73 ./show_info.sh eb7b87055dc1c1e8d7d9ee9c096ce7e9cef7159854efc3818749438455a22e78 ./Handle-self-confined-system-wide-build.patch 749d63bd3ce98969a5422e6edf54af30541033195d431a817f8da320cb91c3c9 ./Remove-peflags-from-the-default-target.patch +e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 ./run-CI.patch