From b9128aded5640ff935ee86eaf6c17c726a7a34dd Mon Sep 17 00:00:00 2001 From: Anthony Date: Sat, 28 Dec 2024 03:33:12 +1100 Subject: [PATCH 1/3] CI: Update release-tag.yml to include the version in the source archive name and prefix --- .github/workflows/release-tag.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml index 11c81b436..b55f3bd23 100644 --- a/.github/workflows/release-tag.yml +++ b/.github/workflows/release-tag.yml @@ -87,21 +87,21 @@ jobs: authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: Create Tarball - run: git archive --format=tgz --prefix=ghostty-source/ -o ghostty-source.tar.gz HEAD + run: git archive --format=tgz --prefix="ghostty-${GHOSTTY_VERSION}/" -o "ghostty-${GHOSTTY_VERSION}.tar.gz" HEAD - name: Sign Tarball run: | echo -n "${{ secrets.MINISIGN_KEY }}" > minisign.key echo -n "${{ secrets.MINISIGN_PASSWORD }}" > minisign.password - nix develop -c minisign -S -m ghostty-source.tar.gz -s minisign.key < minisign.password + nix develop -c minisign -S -m "ghostty-${GHOSTTY_VERSION}.tar.gz" -s minisign.key < minisign.password - name: Upload artifact uses: actions/upload-artifact@v4 with: name: source-tarball path: |- - ghostty-source.tar.gz - ghostty-source.tar.gz.minisig + "ghostty-${GHOSTTY_VERSION}.tar.gz" + "ghostty-${GHOSTTY_VERSION}.tar.gz.minisig" build-macos: needs: [setup] @@ -352,8 +352,8 @@ jobs: run: | mkdir blob mkdir -p blob/${GHOSTTY_VERSION} - mv ghostty-source.tar.gz blob/${GHOSTTY_VERSION}/ghostty-source.tar.gz - mv ghostty-source.tar.gz.minisig blob/${GHOSTTY_VERSION}/ghostty-source.tar.gz.minisig + mv "ghostty-${GHOSTTY_VERSION}.tar.gz blob/${GHOSTTY_VERSION}/ghostty-${GHOSTTY_VERSION}.tar.gz" + mv ghostty-${GHOSTTY_VERSION}.tar.gz.minisig blob/${GHOSTTY_VERSION}/ghostty-${GHOSTTY_VERSION}.tar.gz.minisig mv ghostty-macos-universal.zip blob/${GHOSTTY_VERSION}/ghostty-macos-universal.zip mv ghostty-macos-universal-dsym.zip blob/${GHOSTTY_VERSION}/ghostty-macos-universal-dsym.zip mv Ghostty.dmg blob/${GHOSTTY_VERSION}/Ghostty.dmg From 8335a31e4539051d9a8d46959a88511b998a45dc Mon Sep 17 00:00:00 2001 From: Anthony Date: Sat, 28 Dec 2024 04:04:55 +1100 Subject: [PATCH 2/3] Use github yaml substitution for yaml element --- .github/workflows/release-tag.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml index b55f3bd23..31f2ffb05 100644 --- a/.github/workflows/release-tag.yml +++ b/.github/workflows/release-tag.yml @@ -74,6 +74,8 @@ jobs: source-tarball: runs-on: namespace-profile-ghostty-md needs: [setup] + env: + GHOSTTY_VERSION: ${{ needs.setup.outputs.version }} steps: - uses: actions/checkout@v4 @@ -100,8 +102,8 @@ jobs: with: name: source-tarball path: |- - "ghostty-${GHOSTTY_VERSION}.tar.gz" - "ghostty-${GHOSTTY_VERSION}.tar.gz.minisig" + "ghostty-${{ env.GHOSTTY_VERSION }}.tar.gz" + "ghostty-${{ env.GHOSTTY_VERSION }}.tar.gz.minisig" build-macos: needs: [setup] From 9c15d8de350d626799b5367e0de258d438e992df Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 29 Dec 2024 13:24:18 -0800 Subject: [PATCH 3/3] ci: keep old source tarballs as well --- .github/workflows/release-tag.yml | 9 ++++++++- PACKAGING.md | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release-tag.yml b/.github/workflows/release-tag.yml index 31f2ffb05..a9aba4aa5 100644 --- a/.github/workflows/release-tag.yml +++ b/.github/workflows/release-tag.yml @@ -89,13 +89,16 @@ jobs: authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - name: Create Tarball - run: git archive --format=tgz --prefix="ghostty-${GHOSTTY_VERSION}/" -o "ghostty-${GHOSTTY_VERSION}.tar.gz" HEAD + run: | + git archive --format=tgz --prefix="ghostty-${GHOSTTY_VERSION}/" -o "ghostty-${GHOSTTY_VERSION}.tar.gz" HEAD + git archive --format=tgz --prefix=ghostty-source/ -o ghostty-source.tar.gz HEAD - name: Sign Tarball run: | echo -n "${{ secrets.MINISIGN_KEY }}" > minisign.key echo -n "${{ secrets.MINISIGN_PASSWORD }}" > minisign.password nix develop -c minisign -S -m "ghostty-${GHOSTTY_VERSION}.tar.gz" -s minisign.key < minisign.password + nix develop -c minisign -S -m "ghostty-source.tar.gz" -s minisign.key < minisign.password - name: Upload artifact uses: actions/upload-artifact@v4 @@ -104,6 +107,8 @@ jobs: path: |- "ghostty-${{ env.GHOSTTY_VERSION }}.tar.gz" "ghostty-${{ env.GHOSTTY_VERSION }}.tar.gz.minisig" + ghostty-source.tar.gz + ghostty-source.tar.gz.minisig build-macos: needs: [setup] @@ -356,6 +361,8 @@ jobs: mkdir -p blob/${GHOSTTY_VERSION} mv "ghostty-${GHOSTTY_VERSION}.tar.gz blob/${GHOSTTY_VERSION}/ghostty-${GHOSTTY_VERSION}.tar.gz" mv ghostty-${GHOSTTY_VERSION}.tar.gz.minisig blob/${GHOSTTY_VERSION}/ghostty-${GHOSTTY_VERSION}.tar.gz.minisig + mv ghostty-source.tar.gz blob/${GHOSTTY_VERSION}/ghostty-source.tar.gz + mv ghostty-source.tar.gz.minisig blob/${GHOSTTY_VERSION}/ghostty-source.tar.gz.minisig mv ghostty-macos-universal.zip blob/${GHOSTTY_VERSION}/ghostty-macos-universal.zip mv ghostty-macos-universal-dsym.zip blob/${GHOSTTY_VERSION}/ghostty-macos-universal-dsym.zip mv Ghostty.dmg blob/${GHOSTTY_VERSION}/Ghostty.dmg diff --git a/PACKAGING.md b/PACKAGING.md index aadad0b65..9fb6d6dcf 100644 --- a/PACKAGING.md +++ b/PACKAGING.md @@ -19,8 +19,8 @@ at `release.files.ghostty.org` in the following URL format where `VERSION` is the version number with no prefix such as `1.0.0`: ``` -https://release.files.ghostty.org/VERSION/ghostty-source.tar.gz -https://release.files.ghostty.org/VERSION/ghostty-source.tar.gz.minisig +https://release.files.ghostty.org/VERSION/ghostty-VERSION.tar.gz +https://release.files.ghostty.org/VERSION/ghostty-VERSION.tar.gz.minisig ``` Signature files are signed with