From bfb8d53af244f643b091ec4da79c52b0eb9d53e3 Mon Sep 17 00:00:00 2001 From: James-Mart Date: Mon, 14 Aug 2023 20:41:07 +0000 Subject: [PATCH 1/7] rename submodule regression workflow --- .github/workflows/{pr.yml => submodule-regression.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{pr.yml => submodule-regression.yml} (96%) diff --git a/.github/workflows/pr.yml b/.github/workflows/submodule-regression.yml similarity index 96% rename from .github/workflows/pr.yml rename to .github/workflows/submodule-regression.yml index 328defdec..04a783603 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/submodule-regression.yml @@ -1,4 +1,4 @@ -name: Pull Request +name: Submodule regression on: [pull_request] env: From 76a2e90c911001a24db44fd664fddb1a157ce39e Mon Sep 17 00:00:00 2001 From: James-Mart Date: Mon, 14 Aug 2023 20:53:57 +0000 Subject: [PATCH 2/7] move ubuntu-builder to reusable workflow; use matrix action config to parallelize and simplify workflow --- .github/workflows/ubuntu-2004.yml | 84 ------------------- .../{ubuntu-2204.yml => ubuntu-builder.yml} | 50 +++++------ 2 files changed, 26 insertions(+), 108 deletions(-) delete mode 100644 .github/workflows/ubuntu-2004.yml rename .github/workflows/{ubuntu-2204.yml => ubuntu-builder.yml} (67%) diff --git a/.github/workflows/ubuntu-2004.yml b/.github/workflows/ubuntu-2004.yml deleted file mode 100644 index 354fa2509..000000000 --- a/.github/workflows/ubuntu-2004.yml +++ /dev/null @@ -1,84 +0,0 @@ -name: Ubuntu 20.04 -on: - workflow_dispatch: - push: - branches: - - main - - "release/*" - pull_request: - types: [assigned, opened, synchronize, reopened, labeled] - -env: - UBUNTU_2004_IMAGE: "ghcr.io/gofractally/psibase-builder-ubuntu-2004:b70111acc20bdc6990e756a855fdbf428112c059" - -jobs: - ubuntu-2004-build: - name: Ubuntu 20.04 | Build - runs-on: ubuntu-latest - steps: - - name: Timestamp - id: ccache_cache_timestamp - run: echo timestamp=`date -u +"%Y-%m-%d-%H-%M-%S"` >>$GITHUB_OUTPUT - - name: Checkout - uses: actions/checkout@v3 - with: - submodules: false - fetch-depth: 0 - - name: Preserve ccache - uses: actions/cache@v3 - with: - path: .caches - key: $ubuntu-20.04-caches-${{ steps.ccache_cache_timestamp.outputs.timestamp }} - restore-keys: | - $ubuntu-20.04-caches- - - name: Build - run: | - set -e - echo ===== - mkdir -p $HOME/.ssh - chmod 700 $HOME/.ssh - git submodule update --init --recursive - echo ===== - export CCACHE_DIR=${GITHUB_WORKSPACE}/.caches/ccache - export SCCACHE_DIR=${GITHUB_WORKSPACE}/.caches/sccache - export CCACHE_CONFIGPATH=${GITHUB_WORKSPACE}/ccache.conf - echo max_size = 600M >${GITHUB_WORKSPACE}/ccache.conf - echo log_file = ${GITHUB_WORKSPACE}/ccache.log >>${GITHUB_WORKSPACE}/ccache.conf - export SCCACHE_CACHE_SIZE=200M - export RUSTC_WRAPPER=sccache - export LLVM_CONFIG_PATH=/opt/clang+llvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04/bin/llvm-config - export LD_LIBRARY_PATH=/opt/clang+llvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04/lib/ - export DOCKER="docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} -w ${GITHUB_WORKSPACE} -e CCACHE_DIR -e CCACHE_CONFIGPATH -e SCCACHE_DIR -e SCCACHE_CACHE_SIZE -e RUSTC_WRAPPER -e LLVM_CONFIG_PATH -e LD_LIBRARY_PATH --user $(id -u):$(id -g) ${UBUNTU_2004_IMAGE}" - export DOCKER_ROOT="docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} -w ${GITHUB_WORKSPACE} -e CCACHE_DIR -e CCACHE_CONFIGPATH -e SCCACHE_DIR -e SCCACHE_CACHE_SIZE -e RUSTC_WRAPPER -e LLVM_CONFIG_PATH -e LD_LIBRARY_PATH ${UBUNTU_2004_IMAGE}" - docker pull ${UBUNTU_2004_IMAGE} - echo ===== - ${DOCKER} ccache -s - echo ===== - ${DOCKER} sccache -s - echo ===== - mkdir build - ${DOCKER} bash -c "cd build && cmake -DCMAKE_BUILD_TYPE=Release -DBUILD_RELEASE_WASM=yes -DBUILD_DEBUG_WASM=yes -DBUILD_DOC=yes -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_COMPILER_LAUNCHER=ccache .." - echo ===== - ${DOCKER} bash -c "cd build && make -j $(nproc)" - echo ===== - ${DOCKER} bash -c "cd build && ctest --output-on-failure -j $(nproc)" - echo ===== - ls -la ${GITHUB_WORKSPACE} - echo ===== - ${DOCKER} ccache -s - echo ===== - ${DOCKER} sccache -s - echo ===== - ${DOCKER} bash -c "cd build && cpack -G TGZ -D CPACK_PACKAGE_FILE_NAME=psidk-ubuntu-2004" - echo ===== - ${DOCKER} bash -c "cd build && mv book psidk-book && tar czf ../psidk-book.tar.gz psidk-book" - - name: Upload psidk-ubuntu-2004 - uses: actions/upload-artifact@v1 - with: - name: psidk-ubuntu-2004 - path: build/psidk-ubuntu-2004.tar.gz - - name: Upload psidk-book - uses: actions/upload-artifact@v1 - with: - name: psidk-book - path: psidk-book.tar.gz diff --git a/.github/workflows/ubuntu-2204.yml b/.github/workflows/ubuntu-builder.yml similarity index 67% rename from .github/workflows/ubuntu-2204.yml rename to .github/workflows/ubuntu-builder.yml index 99e694ded..2be241d8f 100644 --- a/.github/workflows/ubuntu-2204.yml +++ b/.github/workflows/ubuntu-builder.yml @@ -1,20 +1,22 @@ -name: Ubuntu 22.04 +name: Ubuntu builds + on: - workflow_dispatch: - push: - branches: - - main - - "release/*" pull_request: types: [assigned, opened, synchronize, reopened, labeled] - -env: - UBUNTU_2204_IMAGE: "ghcr.io/gofractally/psibase-builder-ubuntu-2204:7e3c6e5739df95ba33943789d2cdf5472f91111a" + workflow_dispatch: + workflow_call: jobs: - ubuntu-2204-build: - name: Ubuntu 22.04 | Build + build: + name: Build runs-on: ubuntu-latest + strategy: + matrix: + include: + - builder-image: "ghcr.io/${{ github.repository_owner }}/psibase-builder-ubuntu-2004:b70111acc20bdc6990e756a855fdbf428112c059" + ubuntu-version: "2004" + - builder-image: "ghcr.io/${{ github.repository_owner }}/psibase-builder-ubuntu-2204:7e3c6e5739df95ba33943789d2cdf5472f91111a" + ubuntu-version: "2204" steps: - name: Timestamp id: ccache_cache_timestamp @@ -28,9 +30,9 @@ jobs: uses: actions/cache@v3 with: path: .caches - key: $ubuntu-22.04-caches-${{ steps.ccache_cache_timestamp.outputs.timestamp }} + key: $ubuntu-${{ matrix.ubuntu-version }}-caches-${{ steps.ccache_cache_timestamp.outputs.timestamp }} restore-keys: | - $ubuntu-22.04-caches- + $ubuntu-${{ matrix.ubuntu-version }}-caches- - name: Build run: | set -e @@ -46,9 +48,9 @@ jobs: echo log_file = ${GITHUB_WORKSPACE}/ccache.log >>${GITHUB_WORKSPACE}/ccache.conf export SCCACHE_CACHE_SIZE=200M export RUSTC_WRAPPER=sccache - export DOCKER="docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} -w ${GITHUB_WORKSPACE} -e CCACHE_DIR -e CCACHE_CONFIGPATH -e SCCACHE_DIR -e SCCACHE_CACHE_SIZE -e RUSTC_WRAPPER --user $(id -u):$(id -g) ${UBUNTU_2204_IMAGE}" - export DOCKER_ROOT="docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} -w ${GITHUB_WORKSPACE} -e CCACHE_DIR -e CCACHE_CONFIGPATH -e SCCACHE_DIR -e SCCACHE_CACHE_SIZE -e RUSTC_WRAPPER ${UBUNTU_2204_IMAGE}" - docker pull ${UBUNTU_2204_IMAGE} + export DOCKER="docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} -w ${GITHUB_WORKSPACE} -e CCACHE_DIR -e CCACHE_CONFIGPATH -e SCCACHE_DIR -e SCCACHE_CACHE_SIZE -e RUSTC_WRAPPER --user $(id -u):$(id -g) ${{ matrix.builder-image }}" + export DOCKER_ROOT="docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} -w ${GITHUB_WORKSPACE} -e CCACHE_DIR -e CCACHE_CONFIGPATH -e SCCACHE_DIR -e SCCACHE_CACHE_SIZE -e RUSTC_WRAPPER ${{ matrix.builder-image }}" + docker pull ${{ matrix.builder-image }} echo ===== ${DOCKER} ccache -s echo ===== @@ -68,16 +70,16 @@ jobs: echo ===== ${DOCKER} sccache -s echo ===== - ${DOCKER} bash -c "cd build && cpack -G TGZ -D CPACK_PACKAGE_FILE_NAME=psidk-ubuntu-2204" + ${DOCKER} bash -c "cd build && cpack -G TGZ -D CPACK_PACKAGE_FILE_NAME=psidk-ubuntu-${{ matrix.ubuntu-version }}" echo ===== - ${DOCKER} bash -c "cd build && mv book psidk-book && tar czf ../psidk-book.tar.gz psidk-book" - - name: Upload psidk-ubuntu-2204 + ${DOCKER} bash -c "cd build && mv book psidk-book && tar czf ../psidk-book-${{ matrix.ubuntu-version }}.tar.gz psidk-book" + - name: Upload psidk-ubuntu-${{ matrix.ubuntu-version }} uses: actions/upload-artifact@v1 with: - name: psidk-ubuntu-2204 - path: build/psidk-ubuntu-2204.tar.gz - - name: Upload psidk-book + name: psidk-ubuntu-${{ matrix.ubuntu-version }} + path: build/psidk-ubuntu-${{ matrix.ubuntu-version }}.tar.gz + - name: Upload psidk-book-${{ matrix.ubuntu-version }} uses: actions/upload-artifact@v1 with: - name: psidk-book - path: psidk-book.tar.gz + name: psidk-book-${{ matrix.ubuntu-version }} + path: psidk-book-${{ matrix.ubuntu-version }}.tar.gz From 8bb43a5be78a20236f0a811cac989204d289be28 Mon Sep 17 00:00:00 2001 From: James-Mart Date: Mon, 14 Aug 2023 22:23:34 +0000 Subject: [PATCH 3/7] reuse builder workflow from on-update workflow --- .github/workflows/on-update.yml | 14 ++++++++++++++ .github/workflows/ubuntu-builder.yml | 3 --- 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/on-update.yml diff --git a/.github/workflows/on-update.yml b/.github/workflows/on-update.yml new file mode 100644 index 000000000..0451b609b --- /dev/null +++ b/.github/workflows/on-update.yml @@ -0,0 +1,14 @@ +name: On Update - Build +on: + workflow_dispatch: + push: + branches: + - main + - "release/*" + pull_request: + types: [assigned, opened, synchronize, reopened, labeled] + +jobs: + build: + name: Build + uses: ./.github/workflows/ubuntu-builder.yml diff --git a/.github/workflows/ubuntu-builder.yml b/.github/workflows/ubuntu-builder.yml index 2be241d8f..e4aa0c1a9 100644 --- a/.github/workflows/ubuntu-builder.yml +++ b/.github/workflows/ubuntu-builder.yml @@ -1,9 +1,6 @@ name: Ubuntu builds on: - pull_request: - types: [assigned, opened, synchronize, reopened, labeled] - workflow_dispatch: workflow_call: jobs: From 1515b5989fbbae9ce614420a076e8f414bf1b08f Mon Sep 17 00:00:00 2001 From: James-Mart Date: Mon, 14 Aug 2023 22:27:11 +0000 Subject: [PATCH 4/7] Make job naming clearer --- .github/workflows/on-update.yml | 2 +- .github/workflows/ubuntu-builder.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/on-update.yml b/.github/workflows/on-update.yml index 0451b609b..585a29e18 100644 --- a/.github/workflows/on-update.yml +++ b/.github/workflows/on-update.yml @@ -10,5 +10,5 @@ on: jobs: build: - name: Build + name: Run Builds uses: ./.github/workflows/ubuntu-builder.yml diff --git a/.github/workflows/ubuntu-builder.yml b/.github/workflows/ubuntu-builder.yml index e4aa0c1a9..8486df997 100644 --- a/.github/workflows/ubuntu-builder.yml +++ b/.github/workflows/ubuntu-builder.yml @@ -5,7 +5,7 @@ on: jobs: build: - name: Build + name: Ubuntu ${{ matrix.ubuntu-version }} - Build runs-on: ubuntu-latest strategy: matrix: From f5f839590a10de5d873ca1a9d4c900eebdeb00fb Mon Sep 17 00:00:00 2001 From: James-Mart Date: Mon, 14 Aug 2023 23:26:53 +0000 Subject: [PATCH 5/7] add workflow to generate releases on tag --- .github/workflows/on-tag.yml | 89 ++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 .github/workflows/on-tag.yml diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml new file mode 100644 index 000000000..2c87be601 --- /dev/null +++ b/.github/workflows/on-tag.yml @@ -0,0 +1,89 @@ +name: On Tag - Release + +on: + push: + tags: + - 'v*.*.*' + - 'v*.*.*-*' + +jobs: + debug-print: + name: Branch/tag - ${{github.ref}} + steps: + - name: step1 + id: step1 + run: | + echo "no-op" + + build-psibase: + name: Run Builds + uses: ./.github/workflows/ubuntu-builder.yml + + prerelease-check: + name: Prerelease Check + runs-on: ubuntu-latest + outputs: + prerelease: ${{ steps.set-prerelease-var.outputs.prerelease }} + steps: + - name: Set prerelease variable + id: set-prerelease-var + shell: bash + run: | + if [[ ${{ github.ref_name }} == *-* ]]; then + echo prerelease=true >>$GITHUB_OUTPUT + else + echo prerelease=false >>$GITHUB_OUTPUT + fi + + create-psibase-release: + name: Create Psibase Release + needs: + - build-psibase + - prerelease-check + steps: + - name: "Build Changelog" + id: build_changelog + uses: mikepenz/release-changelog-builder-action@v4 + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Download build artifacts + uses: actions/download-artifact@v3 + + - name: Display structure of downloaded files + run: ls -R + + - name: Create new Github Release + id: create_release + uses: softprops/action-gh-release@v1 + with: + files: | + psidk-ubuntu-2004.tar.gz + psidk-book-2004.tar.gz + psidk-ubuntu-2204.tar.gz + psidk-book-2204.tar.gz + draft: true # TODO: Change to false + prerelease: ${{needs.prerelease-check.outputs.prerelease}} + release_name: ${{ github.ref_name }} + tag_name: ${{ github.ref }} + body_path: ${{ steps.build_changelog.outputs.changelog }} + # note you'll typically need to create a personal access token + # with permissions to create releases in the other repo + #token: ${{ secrets.CUSTOM_GITHUB_TOKEN }} + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + + # build-new-CLI-versions: + # name: Build new CLI version + # needs: create-psibase-release + # runs-on: ubuntu-latest + # steps: + # - env: + # GITHUB_TOKEN: ${{ secrets.WORKFLOW_DISPATCHER_TOKEN }} + # run: | + # version=${{ github.ref_name }} + # gh workflow run cli.yml -f version=$version -R ${{ github.repository_owner }}/image-builders + +# TODO: Psinode image is still taking the binaries from rolling-release. Needs to be changed to +# Download the artifacts from the release that I just uploaded to. From a28c024e3a9049b9c8ec830b64ffface7723d799 Mon Sep 17 00:00:00 2001 From: James-Mart Date: Tue, 15 Aug 2023 16:19:07 +0000 Subject: [PATCH 6/7] pr feedback --- .github/workflows/on-tag.yml | 3 +-- .github/workflows/ubuntu-builder.yml | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 2c87be601..1747944b7 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -59,10 +59,9 @@ jobs: with: files: | psidk-ubuntu-2004.tar.gz - psidk-book-2004.tar.gz psidk-ubuntu-2204.tar.gz psidk-book-2204.tar.gz - draft: true # TODO: Change to false + draft: true prerelease: ${{needs.prerelease-check.outputs.prerelease}} release_name: ${{ github.ref_name }} tag_name: ${{ github.ref }} diff --git a/.github/workflows/ubuntu-builder.yml b/.github/workflows/ubuntu-builder.yml index 8486df997..211574ac7 100644 --- a/.github/workflows/ubuntu-builder.yml +++ b/.github/workflows/ubuntu-builder.yml @@ -12,8 +12,14 @@ jobs: include: - builder-image: "ghcr.io/${{ github.repository_owner }}/psibase-builder-ubuntu-2004:b70111acc20bdc6990e756a855fdbf428112c059" ubuntu-version: "2004" + os-env: | + export LLVM_CONFIG_PATH=/opt/clang+llvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04/bin/llvm-config + export LD_LIBRARY_PATH=/opt/clang+llvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04/lib/ + os-cli-args: "-e LLVM_CONFIG_PATH -e LD_LIBRARY_PATH" - builder-image: "ghcr.io/${{ github.repository_owner }}/psibase-builder-ubuntu-2204:7e3c6e5739df95ba33943789d2cdf5472f91111a" ubuntu-version: "2204" + os-env: "" + os-cli-args: "" steps: - name: Timestamp id: ccache_cache_timestamp @@ -45,8 +51,12 @@ jobs: echo log_file = ${GITHUB_WORKSPACE}/ccache.log >>${GITHUB_WORKSPACE}/ccache.conf export SCCACHE_CACHE_SIZE=200M export RUSTC_WRAPPER=sccache - export DOCKER="docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} -w ${GITHUB_WORKSPACE} -e CCACHE_DIR -e CCACHE_CONFIGPATH -e SCCACHE_DIR -e SCCACHE_CACHE_SIZE -e RUSTC_WRAPPER --user $(id -u):$(id -g) ${{ matrix.builder-image }}" - export DOCKER_ROOT="docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} -w ${GITHUB_WORKSPACE} -e CCACHE_DIR -e CCACHE_CONFIGPATH -e SCCACHE_DIR -e SCCACHE_CACHE_SIZE -e RUSTC_WRAPPER ${{ matrix.builder-image }}" + + ${{ matrix.os-env }} + + export DOCKER="docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} -w ${GITHUB_WORKSPACE} -e CCACHE_DIR -e CCACHE_CONFIGPATH -e SCCACHE_DIR -e SCCACHE_CACHE_SIZE -e RUSTC_WRAPPER ${{ matrix.os-cli-args }} --user $(id -u):$(id -g) ${{ matrix.builder-image }}" + export DOCKER_ROOT="docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} -w ${GITHUB_WORKSPACE} -e CCACHE_DIR -e CCACHE_CONFIGPATH -e SCCACHE_DIR -e SCCACHE_CACHE_SIZE -e RUSTC_WRAPPER ${{ matrix.os-cli-args }} ${{ matrix.builder-image }}" + docker pull ${{ matrix.builder-image }} echo ===== ${DOCKER} ccache -s From 0dd5c1ac6c60849a64657ad99c50d50c09207d86 Mon Sep 17 00:00:00 2001 From: James-Mart Date: Wed, 16 Aug 2023 20:34:15 +0000 Subject: [PATCH 7/7] pr feedback & use env variables from new builder image --- .github/workflows/on-tag.yml | 2 +- .github/workflows/ubuntu-builder.yml | 23 +++++++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/.github/workflows/on-tag.yml b/.github/workflows/on-tag.yml index 1747944b7..96d2ca7f1 100644 --- a/.github/workflows/on-tag.yml +++ b/.github/workflows/on-tag.yml @@ -60,7 +60,7 @@ jobs: files: | psidk-ubuntu-2004.tar.gz psidk-ubuntu-2204.tar.gz - psidk-book-2204.tar.gz + psidk-book.tar.gz draft: true prerelease: ${{needs.prerelease-check.outputs.prerelease}} release_name: ${{ github.ref_name }} diff --git a/.github/workflows/ubuntu-builder.yml b/.github/workflows/ubuntu-builder.yml index 211574ac7..fb8e8ff1f 100644 --- a/.github/workflows/ubuntu-builder.yml +++ b/.github/workflows/ubuntu-builder.yml @@ -10,16 +10,10 @@ jobs: strategy: matrix: include: - - builder-image: "ghcr.io/${{ github.repository_owner }}/psibase-builder-ubuntu-2004:b70111acc20bdc6990e756a855fdbf428112c059" + - builder-image: "ghcr.io/${{ github.repository_owner }}/psibase-builder-ubuntu-2004:b2a46a609b12f645aaeb03245afd0e3d2bf75340" ubuntu-version: "2004" - os-env: | - export LLVM_CONFIG_PATH=/opt/clang+llvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04/bin/llvm-config - export LD_LIBRARY_PATH=/opt/clang+llvm-14.0.0-x86_64-linux-gnu-ubuntu-18.04/lib/ - os-cli-args: "-e LLVM_CONFIG_PATH -e LD_LIBRARY_PATH" - builder-image: "ghcr.io/${{ github.repository_owner }}/psibase-builder-ubuntu-2204:7e3c6e5739df95ba33943789d2cdf5472f91111a" ubuntu-version: "2204" - os-env: "" - os-cli-args: "" steps: - name: Timestamp id: ccache_cache_timestamp @@ -51,11 +45,8 @@ jobs: echo log_file = ${GITHUB_WORKSPACE}/ccache.log >>${GITHUB_WORKSPACE}/ccache.conf export SCCACHE_CACHE_SIZE=200M export RUSTC_WRAPPER=sccache - - ${{ matrix.os-env }} - - export DOCKER="docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} -w ${GITHUB_WORKSPACE} -e CCACHE_DIR -e CCACHE_CONFIGPATH -e SCCACHE_DIR -e SCCACHE_CACHE_SIZE -e RUSTC_WRAPPER ${{ matrix.os-cli-args }} --user $(id -u):$(id -g) ${{ matrix.builder-image }}" - export DOCKER_ROOT="docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} -w ${GITHUB_WORKSPACE} -e CCACHE_DIR -e CCACHE_CONFIGPATH -e SCCACHE_DIR -e SCCACHE_CACHE_SIZE -e RUSTC_WRAPPER ${{ matrix.os-cli-args }} ${{ matrix.builder-image }}" + export DOCKER="docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} -w ${GITHUB_WORKSPACE} -e CCACHE_DIR -e CCACHE_CONFIGPATH -e SCCACHE_DIR -e SCCACHE_CACHE_SIZE -e RUSTC_WRAPPER --user $(id -u):$(id -g) ${{ matrix.builder-image }}" + export DOCKER_ROOT="docker run --rm -v ${GITHUB_WORKSPACE}:${GITHUB_WORKSPACE} -w ${GITHUB_WORKSPACE} -e CCACHE_DIR -e CCACHE_CONFIGPATH -e SCCACHE_DIR -e SCCACHE_CACHE_SIZE -e RUSTC_WRAPPER ${{ matrix.builder-image }}" docker pull ${{ matrix.builder-image }} echo ===== @@ -79,14 +70,14 @@ jobs: echo ===== ${DOCKER} bash -c "cd build && cpack -G TGZ -D CPACK_PACKAGE_FILE_NAME=psidk-ubuntu-${{ matrix.ubuntu-version }}" echo ===== - ${DOCKER} bash -c "cd build && mv book psidk-book && tar czf ../psidk-book-${{ matrix.ubuntu-version }}.tar.gz psidk-book" + ${DOCKER} bash -c "cd build && mv book psidk-book && tar czf ../psidk-book.tar.gz psidk-book" - name: Upload psidk-ubuntu-${{ matrix.ubuntu-version }} uses: actions/upload-artifact@v1 with: name: psidk-ubuntu-${{ matrix.ubuntu-version }} path: build/psidk-ubuntu-${{ matrix.ubuntu-version }}.tar.gz - - name: Upload psidk-book-${{ matrix.ubuntu-version }} + - name: Upload psidk-book uses: actions/upload-artifact@v1 with: - name: psidk-book-${{ matrix.ubuntu-version }} - path: psidk-book-${{ matrix.ubuntu-version }}.tar.gz + name: psidk-book + path: psidk-book.tar.gz