diff --git a/.github/workflows/rs-ci.yml b/.github/workflows/rs-ci.yml index 90871383..d2e3a7fc 100644 --- a/.github/workflows/rs-ci.yml +++ b/.github/workflows/rs-ci.yml @@ -5,7 +5,7 @@ on: branches: [master] paths: - '.cargo/**' - - '.github/workflows/ci.yml' + - '.github/workflows/rs-ci.yml' - 'examples/**' - 'rs/**' - 'templates/**' @@ -24,7 +24,6 @@ on: - 'rust-toolchain.toml' env: - BINARYEN_VERSION: version_111 CARGO_TERM_COLOR: always jobs: @@ -53,9 +52,7 @@ jobs: uses: actions/checkout@v4 - name: Install wasm-opt - run: | - sudo wget -c https://github.com/WebAssembly/binaryen/releases/download/$BINARYEN_VERSION/binaryen-$BINARYEN_VERSION-x86_64-linux.tar.gz -O - | sudo tar -xz -C . - sudo cp binaryen-$BINARYEN_VERSION/bin/wasm-opt /usr/bin/ + uses: ./.github/actions/install-wasm-utils - name: Check Code Formatting run: __GEAR_WASM_BUILDER_NO_FEATURES_TRACKING=1 cargo fmt --all --check diff --git a/.github/workflows/rs-release.yml b/.github/workflows/rs-release.yml index ae306393..16a170c2 100644 --- a/.github/workflows/rs-release.yml +++ b/.github/workflows/rs-release.yml @@ -32,6 +32,7 @@ jobs: outputs: rc_branch: ${{ steps.release_branch.outputs.rc_branch }} r_version: ${{ steps.release_info.outputs.version }} + r_tag: rs/v${{ steps.release_info.outputs.version }} steps: - name: Checkout Code @@ -75,6 +76,7 @@ jobs: ws_tests: name: Run Workspace Tests + if: false needs: - prepare uses: ./.github/workflows/rs-run-ws-tests.yml @@ -84,6 +86,7 @@ jobs: cli_tests: name: Run CLI Tests + if: false needs: - prepare uses: ./.github/workflows/rs-run-cli-tests.yml @@ -127,8 +130,8 @@ jobs: contents: write needs: - prepare - - ws_tests - - cli_tests + #- ws_tests + #- cli_tests - assets defaults: run: @@ -148,6 +151,7 @@ jobs: sed -i "/^\s*${SAILS_CRATE} = {.*}/ s/}/, version = \"=${VERSION}\" }/" Cargo.toml done cat Cargo.toml + cargo login - name: Download Assets uses: actions/download-artifact@v4 @@ -157,7 +161,7 @@ jobs: - name: Create Release Tag run: | - R_TAG="rs/v${{ needs.prepare.outputs.r_version }}" + R_TAG=${{ needs.prepare.outputs.r_tag }} git config --global user.name "$GITHUB_USER_NAME" git config --global user.email "$GITHUB_USER_EMAIL" git tag -a "$R_TAG" -m "Release v${{ needs.prepare.outputs.r_version }}" @@ -167,11 +171,10 @@ jobs: uses: softprops/action-gh-release@v2 with: name: Sails-RS v${{ needs.prepare.outputs.r_version }} - tag_name: rs/v${{ needs.prepare.outputs.r_version }} + tag_name: ${{ needs.prepare.outputs.r_tag }} draft: true generate_release_notes: true fail_on_unmatched_files: true files: | ./assets/sails_idl_parser/sails_idl_parser.wasm token: ${{ secrets.GITHUB_TOKEN }} -