use setup actions

jcbhmr · Jan 30, 2024 · ad6ba7d · ad6ba7d
1 parent bd5a80c
commit ad6ba7d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/.github/workflows/deploy-pages.yml b/.github/workflows/deploy-pages.yml
@@ -25,10 +25,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: rustup target add wasm32-unknown-unknown
-      - uses: cargo-bins/cargo-binstall@main
-      - run: cargo binstall cargo-component -y
-      - run: |
-          cargo binstall --git https://github.com/bytecodealliance/wit-bindgen wit-bindgen-cli -y
+      - uses: jcbhmr/setup-cargo-component@v1
+      - uses: jcbhmr/setup-wit-bindgen@v1
       - id: configure-pages
         uses: actions/configure-pages@v4
       - run: make build

diff --git a/.github/workflows/make-build.yml b/.github/workflows/make-build.yml
@@ -30,15 +30,13 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: rustup target add wasm32-unknown-unknown
-      - uses: cargo-bins/cargo-binstall@main
-      - run: cargo binstall cargo-component -y
-      - run: cargo binstall wasm-tools -y
+      - uses: jcbhmr/setup-cargo-component@v1
+      - uses: jcbhmr/setup-wasm-tools@v1
       - run: make build
       - run: |
           wasm-tools component wit \
-            target/wasm32-unknown-unknown/debug/${{ env.COMPONENT_WORLD }}.wasm \
-            | sed 's/^/    /' \
-            >> "$GITHUB_STEP_SUMMARY"
+            "target/wasm32-unknown-unknown/debug/$COMPONENT_WORLD.wasm" \
+            | sed 's/^/    /' >> "$GITHUB_STEP_SUMMARY"
       - uses: actions/upload-artifact@v4
         with:
           name: artifact

diff --git a/.github/workflows/make-publish.yml b/.github/workflows/make-publish.yml
@@ -12,8 +12,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: rustup target add wasm32-unknown-unknown
-      - uses: cargo-bins/cargo-binstall@main
-      - run: cargo binstall cargo-component -y
+      - uses: jcbhmr/setup-cargo-component@v1
       - run: make build RELEASE=1
       - run: make publish GHFLAGS="$GHFLAGS"
         env: