Merge pull request #15 from RusPiRo/fix/macro_dependency

Fix github actions on branch builds
RusPiRo · Apr 18, 2021 · 2ad61ab · 2ad61ab
2 parents e17626a + 444b8a5
commit 2ad61ab
Showing 1 changed file with 11 additions and 5 deletions.
diff --git 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: |
@@ -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 }}