From af094f98a7c75e4a546a8089e15a4d263a47fea9 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Sun, 12 Nov 2023 12:12:07 -0800 Subject: [PATCH] Only upload one copy of linux binaries to releases We upload the statically-linked Alpine edge binaries, as these are probably the most portable. Note that the statically-linked Alpine binaries are actually smaller than the Debian executables (~35 MB archive vs ~41 MB archive), though the Debian ones are pie (position-independent executables, supporting Address Space Layout Randomization). --- .github/workflows/coq-alpine.yml | 4 ++-- .github/workflows/coq-debian.yml | 32 ++++++++++++++++---------------- .github/workflows/coq-docker.yml | 32 ++++++++++++++++---------------- 3 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/coq-alpine.yml b/.github/workflows/coq-alpine.yml index 48100404211..5c4aff291c4 100644 --- a/.github/workflows/coq-alpine.yml +++ b/.github/workflows/coq-alpine.yml @@ -174,9 +174,9 @@ jobs: - name: Unpack files run: | mkdir dist - mv dist-edge/standalone.tar.gz dist/fiat-crypto-alpine-edge.tar.gz + mv dist-edge/standalone.tar.gz dist/fiat-crypto-linux-x86_64.tar.gz find dist - tar -tvf dist/fiat-crypto-alpine-edge.tar.gz + tar -tvf dist/fiat-crypto-linux-x86_64.tar.gz - name: Upload artifacts to GitHub Release env: GITHUB_TOKEN: ${{ github.token }} diff --git a/.github/workflows/coq-debian.yml b/.github/workflows/coq-debian.yml index fc7d4d19c55..77afcf009b4 100644 --- a/.github/workflows/coq-debian.yml +++ b/.github/workflows/coq-debian.yml @@ -176,7 +176,7 @@ jobs: echo "::endgroup::" done - publish-standalone: + publish-standalone-dry-run: runs-on: ubuntu-latest needs: build permissions: @@ -196,20 +196,20 @@ jobs: mv dist-sid/standalone.tar.gz dist/fiat-crypto-sid.tar.gz find dist tar -tvf dist/fiat-crypto-sid.tar.gz - - name: Upload artifacts to GitHub Release - env: - GITHUB_TOKEN: ${{ github.token }} - # Upload to GitHub Release using the `gh` CLI. - # `dist/` contains the built packages - run: >- - gh release upload - '${{ github.ref_name }}' dist/** - --repo '${{ github.repository }}' - if: ${{ startsWith(github.ref, 'refs/tags/') && github.event_name == 'release' }} +# - name: Upload artifacts to GitHub Release +# env: +# GITHUB_TOKEN: ${{ github.token }} +# # Upload to GitHub Release using the `gh` CLI. +# # `dist/` contains the built packages +# run: >- +# gh release upload +# '${{ github.ref_name }}' dist/** +# --repo '${{ github.repository }}' +# if: ${{ startsWith(github.ref, 'refs/tags/') && github.event_name == 'release' }} debian-check-all: runs-on: ubuntu-latest - needs: [build, test-amd64, test-standalone, publish-standalone] + needs: [build, test-amd64, test-standalone, publish-standalone-dry-run] if: always() steps: - run: echo 'build passed' @@ -218,13 +218,13 @@ jobs: if: ${{ needs.test-amd64.result == 'success' }} - run: echo 'test-standalone passed' if: ${{ needs.test-standalone == 'success' }} - - run: echo 'publish-standalone passed' - if: ${{ needs.publish-standalone.result == 'success' }} + - run: echo 'publish-standalone-dry-run passed' + if: ${{ needs.publish-standalone-dry-run.result == 'success' }} - run: echo 'build failed' && false if: ${{ needs.build.result != 'success' }} - run: echo 'test-amd64 failed' && false if: ${{ needs.test-amd64.result != 'success' }} - run: echo 'test-standalone failed' && false if: ${{ needs.test-standalone != 'success' }} - - run: echo 'publish-standalone failed' && false - if: ${{ needs.publish-standalone.result != 'success' }} + - run: echo 'publish-standalone-dry-run failed' && false + if: ${{ needs.publish-standalone-dry-run.result != 'success' }} diff --git a/.github/workflows/coq-docker.yml b/.github/workflows/coq-docker.yml index fd3bf4bd535..d8555dc8d84 100644 --- a/.github/workflows/coq-docker.yml +++ b/.github/workflows/coq-docker.yml @@ -198,7 +198,7 @@ jobs: echo "::endgroup::" done - publish-standalone: + publish-standalone-dry-run: runs-on: ubuntu-latest needs: build permissions: @@ -218,20 +218,20 @@ jobs: mv dist-docker-coq-dev/standalone.tar.gz dist/fiat-crypto-docker-coq-dev.tar.gz find dist tar -tvf dist/fiat-crypto-docker-coq-dev.tar.gz - - name: Upload artifacts to GitHub Release - env: - GITHUB_TOKEN: ${{ github.token }} - # Upload to GitHub Release using the `gh` CLI. - # `dist/` contains the built packages - run: >- - gh release upload - '${{ github.ref_name }}' dist/** - --repo '${{ github.repository }}' - if: ${{ startsWith(github.ref, 'refs/tags/') && github.event_name == 'release' }} +# - name: Upload artifacts to GitHub Release +# env: +# GITHUB_TOKEN: ${{ github.token }} +# # Upload to GitHub Release using the `gh` CLI. +# # `dist/` contains the built packages +# run: >- +# gh release upload +# '${{ github.ref_name }}' dist/** +# --repo '${{ github.repository }}' +# if: ${{ startsWith(github.ref, 'refs/tags/') && github.event_name == 'release' }} docker-check-all: runs-on: ubuntu-latest - needs: [build, test-amd64, test-standalone, publish-standalone] + needs: [build, test-amd64, test-standalone, publish-standalone-dry-run] if: always() steps: - run: echo 'build passed' @@ -240,13 +240,13 @@ jobs: if: ${{ needs.test-amd64.result == 'success' }} - run: echo 'test-standalone passed' if: ${{ needs.test-standalone == 'success' }} - - run: echo 'publish-standalone passed' - if: ${{ needs.publish-standalone.result == 'success' }} + - run: echo 'publish-standalone-dry-run passed' + if: ${{ needs.publish-standalone-dry-run.result == 'success' }} - run: echo 'build failed' && false if: ${{ needs.build.result != 'success' }} - run: echo 'test-amd64 failed' && false if: ${{ needs.test-amd64.result != 'success' }} - run: echo 'test-standalone failed' && false if: ${{ needs.test-standalone != 'success' }} - - run: echo 'publish-standalone failed' && false - if: ${{ needs.publish-standalone.result != 'success' }} + - run: echo 'publish-standalone-dry-run failed' && false + if: ${{ needs.publish-standalone-dry-run.result != 'success' }}