From cdda7214928f37b9cd0a521ab2daac67528203e4 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 14 Jan 2023 13:24:03 +0100 Subject: [PATCH 01/10] CI: add a workflow dispatch option to build from staging If active it includes the staging repo, but doesn't upload the build in the end. --- .github/workflows/build.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 50ab6f2..0ae4366 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,6 +4,12 @@ on: push: pull_request: workflow_dispatch: + inputs: + with_staging: + description: 'Include the staging repo when building the installer' + default: false + required: false + type: boolean schedule: - cron: '0 3 * * *' @@ -33,6 +39,12 @@ jobs: echo 'Server = https://repo.msys2.org/msys/$arch/' > /etc/pacman.d/mirrorlist.msys pacman-conf.exe + - name: Add staging repo + if: ${{ github.event.inputs.with_staging }} + shell: msys2 {0} + run: | + sed -i '1s|^|[staging]\nServer = https://repo.msys2.org/staging/\nSigLevel = Never\n|' /etc/pacman.conf + - name: Update using the main mirror & Check install run: | msys2 -c 'pacman --noconfirm -Suuy' @@ -170,7 +182,7 @@ jobs: - test-docker-sfx - test-installer - test-sfx - if: github.ref == 'refs/heads/main' + if: github.ref == 'refs/heads/main' && !${{ github.event.inputs.with_staging }} runs-on: ubuntu-latest steps: - uses: actions/download-artifact@v3 From b5fb29838701f2a3ac60e6f40b5ac695ad91ebef Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 14 Jan 2023 14:13:36 +0100 Subject: [PATCH 02/10] CI: another try at skipping upload with staging --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ae4366..eae29d0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -182,7 +182,7 @@ jobs: - test-docker-sfx - test-installer - test-sfx - if: github.ref == 'refs/heads/main' && !${{ github.event.inputs.with_staging }} + if: github.ref == 'refs/heads/main' && !github.event.inputs.with_staging runs-on: ubuntu-latest steps: - uses: actions/download-artifact@v3 From cfd23616d22d89006cd6ed9ef9dc25a63347833b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 14 Jan 2023 15:27:45 +0100 Subject: [PATCH 03/10] add note that building from staging will not upload the installer --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eae29d0..40ad216 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: inputs: with_staging: - description: 'Include the staging repo when building the installer' + description: 'Include the staging repo when building the installer (and skip the final upload)' default: false required: false type: boolean From 68a5ee8f336d8bb07c37a7b3f1f0720ebc04103a Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 19 Jan 2023 00:43:04 +0100 Subject: [PATCH 04/10] Revert "add note that building from staging will not upload the installer" This reverts commit cfd23616d22d89006cd6ed9ef9dc25a63347833b. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 40ad216..eae29d0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -6,7 +6,7 @@ on: workflow_dispatch: inputs: with_staging: - description: 'Include the staging repo when building the installer (and skip the final upload)' + description: 'Include the staging repo when building the installer' default: false required: false type: boolean From 56d39282b5a5f34c1a9d30ac7d27179a9df394a2 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 19 Jan 2023 00:43:06 +0100 Subject: [PATCH 05/10] Revert "CI: another try at skipping upload with staging" This reverts commit b5fb29838701f2a3ac60e6f40b5ac695ad91ebef. --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index eae29d0..0ae4366 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -182,7 +182,7 @@ jobs: - test-docker-sfx - test-installer - test-sfx - if: github.ref == 'refs/heads/main' && !github.event.inputs.with_staging + if: github.ref == 'refs/heads/main' && !${{ github.event.inputs.with_staging }} runs-on: ubuntu-latest steps: - uses: actions/download-artifact@v3 From e73e164c3ccea027dded5730f3d6021ca6328cf0 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 19 Jan 2023 00:43:09 +0100 Subject: [PATCH 06/10] Revert "CI: add a workflow dispatch option to build from staging" This reverts commit cdda7214928f37b9cd0a521ab2daac67528203e4. Despite it defaulting to false it somehow is true when starting via the github UI. Not sure why right now, so reverting. --- .github/workflows/build.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0ae4366..50ab6f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,12 +4,6 @@ on: push: pull_request: workflow_dispatch: - inputs: - with_staging: - description: 'Include the staging repo when building the installer' - default: false - required: false - type: boolean schedule: - cron: '0 3 * * *' @@ -39,12 +33,6 @@ jobs: echo 'Server = https://repo.msys2.org/msys/$arch/' > /etc/pacman.d/mirrorlist.msys pacman-conf.exe - - name: Add staging repo - if: ${{ github.event.inputs.with_staging }} - shell: msys2 {0} - run: | - sed -i '1s|^|[staging]\nServer = https://repo.msys2.org/staging/\nSigLevel = Never\n|' /etc/pacman.conf - - name: Update using the main mirror & Check install run: | msys2 -c 'pacman --noconfirm -Suuy' @@ -182,7 +170,7 @@ jobs: - test-docker-sfx - test-installer - test-sfx - if: github.ref == 'refs/heads/main' && !${{ github.event.inputs.with_staging }} + if: github.ref == 'refs/heads/main' runs-on: ubuntu-latest steps: - uses: actions/download-artifact@v3 From 741fb309a289a774334d9b7db16ab834cd44741e Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Sat, 18 Mar 2023 11:12:04 +0100 Subject: [PATCH 07/10] Update 7-Zip-zstd to v22.01-v1.5.4-R4 https://github.com/mcmilk/7-Zip-zstd/releases/tag/v22.01-v1.5.4-R4 --- create-sfx.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/create-sfx.sh b/create-sfx.sh index ee01822..1ade429 100644 --- a/create-sfx.sh +++ b/create-sfx.sh @@ -4,13 +4,13 @@ set -e # Download and extract https://github.com/mcmilk/7-Zip-zstd -NAME="7z21.03-zstd-x64" -CHECKSUM="531b20dfb03d8f30f61ae56a181610bbb6f3cf7cc71dac1d8f95511289de76f3" +NAME="7z22.01-zstd-x64" +CHECKSUM="b7fca6f44407e5fcedec98c58f3edb83407299cd88520bab7f7410d55bdd8e57" DIR="$( cd "$( dirname "$0" )" && pwd )" mkdir -p "$DIR/_cache" BASE="$DIR/_cache/$NAME" if [ ! -f "$BASE.exe" ]; then - curl --fail -L "https://github.com/mcmilk/7-Zip-zstd/releases/download/v21.03-v1.5.0-R2/$NAME.exe" -o "$BASE.exe" + curl --fail -L "https://github.com/mcmilk/7-Zip-zstd/releases/download/v22.01-v1.5.4-R4/$NAME.exe" -o "$BASE.exe" fi echo "$CHECKSUM $BASE.exe" | sha256sum --quiet --check if [ ! -d "$BASE" ]; then From 59a34503fecaca5927b9867e714aebed7023b484 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Fri, 26 May 2023 14:31:36 +0200 Subject: [PATCH 08/10] Update 7-Zip-zstd to v22.01-v1.5.5-R2 --- create-sfx.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/create-sfx.sh b/create-sfx.sh index 1ade429..d49cd10 100644 --- a/create-sfx.sh +++ b/create-sfx.sh @@ -5,12 +5,12 @@ set -e # Download and extract https://github.com/mcmilk/7-Zip-zstd NAME="7z22.01-zstd-x64" -CHECKSUM="b7fca6f44407e5fcedec98c58f3edb83407299cd88520bab7f7410d55bdd8e57" +CHECKSUM="0c5497632d00669e9d85ab3a495e75b66e7d45fb7fad245474278d7138e69632" DIR="$( cd "$( dirname "$0" )" && pwd )" mkdir -p "$DIR/_cache" BASE="$DIR/_cache/$NAME" if [ ! -f "$BASE.exe" ]; then - curl --fail -L "https://github.com/mcmilk/7-Zip-zstd/releases/download/v22.01-v1.5.4-R4/$NAME.exe" -o "$BASE.exe" + curl --fail -L "https://github.com/mcmilk/7-Zip-zstd/releases/download/v22.01-v1.5.5-R2/$NAME.exe" -o "$BASE.exe" fi echo "$CHECKSUM $BASE.exe" | sha256sum --quiet --check if [ ! -d "$BASE" ]; then From 224d05263cb97595fe077427d9bd3a20a0b9dd25 Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Mon, 17 Jul 2023 18:55:22 +0200 Subject: [PATCH 09/10] Update 7-Zip-zstd to v22.01-v1.5.5-R3 --- create-sfx.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/create-sfx.sh b/create-sfx.sh index d49cd10..a1cbc87 100644 --- a/create-sfx.sh +++ b/create-sfx.sh @@ -5,12 +5,12 @@ set -e # Download and extract https://github.com/mcmilk/7-Zip-zstd NAME="7z22.01-zstd-x64" -CHECKSUM="0c5497632d00669e9d85ab3a495e75b66e7d45fb7fad245474278d7138e69632" +CHECKSUM="d542d78397bbed8e77c221f36cad461a0d83f1263b993a7048e81df40f403fb8" DIR="$( cd "$( dirname "$0" )" && pwd )" mkdir -p "$DIR/_cache" BASE="$DIR/_cache/$NAME" if [ ! -f "$BASE.exe" ]; then - curl --fail -L "https://github.com/mcmilk/7-Zip-zstd/releases/download/v22.01-v1.5.5-R2/$NAME.exe" -o "$BASE.exe" + curl --fail -L "https://github.com/mcmilk/7-Zip-zstd/releases/download/v22.01-v1.5.5-R3/$NAME.exe" -o "$BASE.exe" fi echo "$CHECKSUM $BASE.exe" | sha256sum --quiet --check if [ ! -d "$BASE" ]; then From a3839b22e2adade5901429bdacc63b482cec326b Mon Sep 17 00:00:00 2001 From: Christoph Reiter Date: Thu, 26 Oct 2023 10:31:33 +0200 Subject: [PATCH 10/10] Generate a list of all included packages and their versions might be useful to know what changed between installers --- .github/workflows/build.yml | 1 + make-msys2-installer | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 50ab6f2..fa9c6fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,6 +49,7 @@ jobs: mv msys2-base-x86_64-[0-9]*.sfx.exe msys2-base-x86_64-latest.sfx.exe mv msys2-x86_64-[0-9]*.exe msys2-x86_64-latest.exe mv msys2-*.tar.xz msys2-base-x86_64-latest.tar.xz + mv msys2-*.packages.txt msys2-base-x86_64-latest.packages.txt sha256sum.exe msys2-* sha256sum.exe msys2-* > msys2-checksums.txt diff --git a/make-msys2-installer b/make-msys2-installer index 453832e..9b39043 100644 --- a/make-msys2-installer +++ b/make-msys2-installer @@ -72,6 +72,7 @@ create_chroot_system() { pacman -Syu --root "${_newmsys}" pacman -S filesystem msys2-runtime --noconfirm --root "${_newmsys}" pacman -S base --noconfirm --root "${_newmsys}" + pacman -Q --root "${_newmsys}" > "${_thisdir}/msys2-base-x86_64-${_date}.packages.txt" popd > /dev/null }