Simplify CI artifact packaging and remove nested ZIP archives
ci / ubuntu-latest (push) Failing after 10s
ci / macos-latest (push) Has been cancelled
ci / windows-latest (push) Has been cancelled
ci / release (push) Has been cancelled

This commit is contained in:
TheM14 committed 2026-10-17 02:52:06 +08:00
1 parent 7eb2fa3b61
commit 7b83358eb5
1 file changed
+44 -22
+44 -22
View File
@@ -1,9 +1,9 @@
name: ci name: ci
# Builds and tests every push and pull request, packages the CLI as a workflow # Build and test on every push and pull request.
# artifact, and -- when a tag is pushed -- turns those packages into a GitHub # Upload unpacked files as Actions artifacts.
# release. One file keeps the release job inside the same run as the build, so it # Create ZIP archives only when publishing a release.
# collects that run's artifacts instead of rebuilding them.
on: on:
push: push:
@@ -25,6 +25,7 @@ jobs:
label: macos label: macos
- os: windows-latest - os: windows-latest
label: windows label: windows
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -47,49 +48,70 @@ jobs:
- name: Test - name: Test
run: ctest --test-dir build --output-on-failure -C Release run: ctest --test-dir build --output-on-failure -C Release
# The CLI and its runtime assets sit at the archive root with the libraries
# in lib/ below, so the download can be unpacked and run as it is.
- name: Stage - name: Stage
run: cmake --install build --config Release --prefix stage run: cmake --install build --config Release --prefix stage
# Place executables at the package root and libraries in lib/.
- name: Package - name: Package
shell: bash shell: bash
run: | run: |
folder="joc_cli_${{ matrix.label }}" mkdir -p package/lib
mkdir -p "package/$folder/lib" cp -r stage/bin/. package/
cp -r stage/bin/. "package/$folder/" cp -r stage/lib/. package/lib/
cp -r stage/lib/. "package/$folder/lib/"
- name: Archive
run: cmake -E tar cf "joc_cli_${{ matrix.label }}.zip" --format=zip "package/joc_cli_${{ matrix.label }}"
# GitHub automatically creates the artifact ZIP.
# Upload files directly to avoid nested ZIP archives.
- name: Upload - name: Upload
uses: actions/upload-artifact@v4 uses: actions/upload-artifact@v4
with: with:
name: joc_cli_${{ matrix.label }} name: joc_cli_${{ matrix.label }}
path: joc_cli_${{ matrix.label }}.zip path: package/
if-no-files-found: error if-no-files-found: error
release: release:
# A pushed tag is what makes a release; branch and PR builds only leave # Only tagged builds create releases.
# artifacts. The archives come from the build job of this same run.
if: startsWith(github.ref, 'refs/tags/') if: startsWith(github.ref, 'refs/tags/')
needs: build needs: build
runs-on: ubuntu-latest runs-on: ubuntu-latest
permissions: permissions:
contents: write contents: write
steps: steps:
- name: Collect the packaged archives # Keep each platform's files in a separate directory.
- name: Collect build artifacts
uses: actions/download-artifact@v4 uses: actions/download-artifact@v4
with: with:
pattern: joc_cli_*
path: dist path: dist
merge-multiple: true merge-multiple: false
- name: List what will be published # Create flat ZIP archives from the artifact contents.
run: ls -l dist # Restore executable permissions on Unix platforms.
- name: Create release archives
shell: bash
run: |
for platform in linux macos windows; do
dir="dist/joc_cli_${platform}"
# The archives are attached to the tag's release, whether it already exists if [ ! -d "$dir" ]; then
# (created in the web interface) or has to be created here. echo "Missing artifact: joc_cli_${platform}" >&2
exit 1
fi
if [ "$platform" != "windows" ]; then
chmod +x "$dir/joc_cli"
fi
(
cd "$dir"
cmake -E tar cf "../joc_cli_${platform}.zip" --format=zip -- *
)
done
- name: List release archives
run: ls -lh dist/*.zip
# Publish the archives directly to GitHub Releases.
- name: Publish - name: Publish
env: env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}