From 6a429cb41e482f941cbd8d6f74a85c34bb6b9c49 Mon Sep 17 00:00:00 2001 From: 2ndTaleStudio <43264484+2ndTaleStudio@users.noreply.github.com> Date: Sun, 18 Apr 2021 09:39:36 +0200 Subject: [PATCH 1/2] keep patches also on branch builds --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 47e86e6..bf92d8c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,10 +31,10 @@ jobs: with: version: 'latest' - - if: ${{ github.event_name != 'pull_request' }} - name: Remove patches if not a PR build - run: | - sed -i "/{^\[patch\.crates-io\] /{:a;N;/\Z}/!ba};/^ruspiro-.*\(git\|path\).*/d" ./interrupt/Cargo.toml; + # - if: ${{ github.event_name != 'pull_request' }} + # name: Remove patches if not a PR build + # run: | + # sed -i "/{^\[patch\.crates-io\] /{:a;N;/\Z}/!ba};/^ruspiro-.*\(git\|path\).*/d" ./interrupt/Cargo.toml; - name: Compile run: | From 444b8a5e7549ec6f18bd05e618959e2e264b20d8 Mon Sep 17 00:00:00 2001 From: 2ndTaleStudio <43264484+2ndTaleStudio@users.noreply.github.com> Date: Sun, 18 Apr 2021 09:44:01 +0200 Subject: [PATCH 2/2] fix github action --- .github/workflows/ci.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bf92d8c..251475f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -217,7 +217,13 @@ jobs: # and the README.md sed -i -e 's/||VERSION||/'$CRATE_VERSION'/g' README.md + # as macros are published now - do the dry run for interrupt followed by the real publish + - name: Publish-Dry-Run + run: | + cd ./interrupt/ + cargo make publish_dry --profile pipeline + - name: Publish-Run run: | - cd ../interrupt/ + cd ./interrupt/ cargo make publish --env CRATES_TOKEN=${{ secrets.CRATES_TOKEN }}