From df5e4b6bd83e540bdb43e97fc263027abb0135e6 Mon Sep 17 00:00:00 2001 From: Trae Yelovich Date: Mon, 24 Jul 2023 14:56:01 -0400 Subject: [PATCH] fix: remove dir test and use npm instead of yarn Signed-off-by: Trae Yelovich --- .github/workflows/secrets-sdk.yml | 61 ++++++++++++------------------- 1 file changed, 24 insertions(+), 37 deletions(-) diff --git a/.github/workflows/secrets-sdk.yml b/.github/workflows/secrets-sdk.yml index 65312adfe0..8e41817c60 100644 --- a/.github/workflows/secrets-sdk.yml +++ b/.github/workflows/secrets-sdk.yml @@ -27,42 +27,41 @@ jobs: - host: macos-latest target: x86_64-apple-darwin build: | - yarn build + npm run build - host: windows-latest - build: yarn build + build: npm run build target: x86_64-pc-windows-msvc - host: windows-latest build: | - yarn build --target i686-pc-windows-msvc - dir src\keyring - yarn test + npm run build --target i686-pc-windows-msvc + npm run test target: i686-pc-windows-msvc - host: ubuntu-latest target: x86_64-unknown-linux-gnu use-cross: true build: | set -e - CARGO=cross yarn build --target x86_64-unknown-linux-gnu + CARGO=cross npm run build --target x86_64-unknown-linux-gnu - host: ubuntu-latest target: i686-unknown-linux-gnu use-cross: true build: | set -e source scripts/configure-cross.sh i686-unknown-linux-gnu - CARGO=cross yarn build --target i686-unknown-linux-gnu + CARGO=cross npm run build --target i686-unknown-linux-gnu - host: ubuntu-latest target: armv7-unknown-linux-gnueabihf use-cross: true build: | set -e source scripts/configure-cross.sh armv7-unknown-linux-gnueabihf - CARGO=cross yarn build --target armv7-unknown-linux-gnueabihf + CARGO=cross npm run build --target armv7-unknown-linux-gnueabihf - host: ubuntu-latest target: x86_64-unknown-linux-musl use-cross: true build: | set -e - CARGO=cross yarn build --target x86_64-unknown-linux-musl + CARGO=cross npm run build --target x86_64-unknown-linux-musl - host: macos-latest target: aarch64-apple-darwin build: | @@ -71,24 +70,24 @@ jobs: export CXX=$(xcrun -f clang++); SYSROOT=$(xcrun --sdk macosx --show-sdk-path); export CFLAGS="-isysroot $SYSROOT -isystem $SYSROOT"; - yarn build --target aarch64-apple-darwin + npm run build --target aarch64-apple-darwin - host: ubuntu-latest target: aarch64-unknown-linux-gnu use-cross: true build: | set -e source scripts/configure-cross.sh aarch64-unknown-linux-gnu - CARGO=cross yarn build --target aarch64-unknown-linux-gnu + CARGO=cross npm run build --target aarch64-unknown-linux-gnu - host: ubuntu-latest target: aarch64-unknown-linux-musl use-cross: true build: | set -e source scripts/configure-cross.sh aarch64-unknown-linux-musl - CARGO=cross yarn build --target aarch64-unknown-linux-musl + CARGO=cross npm run build --target aarch64-unknown-linux-musl - host: windows-latest target: aarch64-pc-windows-msvc - build: yarn build --target aarch64-pc-windows-msvc + build: npm run build --target aarch64-pc-windows-msvc name: stable - ${{ matrix.settings.target }} - node@16 runs-on: ${{ matrix.settings.host }} steps: @@ -122,12 +121,8 @@ jobs: run: ${{ matrix.settings.setup }} if: ${{ matrix.settings.setup }} shell: bash - - name: Setup node x86 - if: matrix.settings.target == 'i686-pc-windows-msvc' - run: yarn config set supportedArchitectures.cpu "ia32" - shell: bash - name: Install dependencies - run: yarn + run: npm install working-directory: . - name: Setup node x86 uses: actions/setup-node@v3 @@ -152,7 +147,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: bindings-${{ matrix.settings.target }} - path: ${{ env.APP_NAME }}.*.node + path: packages/secrets/src/keyring/${{ env.APP_NAME }}.*.node if-no-files-found: error # build-freebsd: # runs-on: macos-12 @@ -231,14 +226,14 @@ jobs: check-latest: true cache: npm - name: Install dependencies - run: yarn + run: npm install - name: Download artifacts uses: actions/download-artifact@v3 with: name: bindings-${{ matrix.settings.target }} path: . - name: Test bindings - run: yarn test + run: npm run test test-linux-x64-gnu-binding: defaults: run: @@ -263,7 +258,7 @@ jobs: check-latest: true cache: npm - name: Install dependencies - run: yarn + run: npm install - name: Download artifacts uses: actions/download-artifact@v3 with: @@ -302,9 +297,7 @@ jobs: check-latest: true cache: npm - name: Install dependencies - run: | - yarn config set supportedArchitectures.libc "musl" - yarn + run: npm install - name: Download artifacts uses: actions/download-artifact@v3 with: @@ -342,9 +335,7 @@ jobs: name: bindings-aarch64-unknown-linux-gnu path: . - name: Install dependencies - run: | - yarn config set supportedArchitectures.cpu "arm64" - yarn config set supportedArchitectures.libc "glibc" + run: npm install - name: Set up QEMU uses: docker/setup-qemu-action@v2 with: @@ -375,9 +366,7 @@ jobs: name: bindings-aarch64-unknown-linux-musl path: . - name: Install dependencies - run: | - yarn config set supportedArchitectures.cpu "arm64" - yarn config set supportedArchitectures.libc "musl" + run: npm install - name: Set up QEMU uses: docker/setup-qemu-action@v2 with: @@ -390,7 +379,7 @@ jobs: options: '-v ${{ github.workspace }}:/build -w /build --cap-add=IPC_LOCK' run: | set -e - apk add dbus nodejs yarn npm gnome-keyring libsecret + apk add dbus nodejs npm gnome-keyring libsecret dbus-run-session -- sh linux-test.sh test-linux-arm-gnueabihf-binding: defaults: @@ -415,9 +404,7 @@ jobs: name: bindings-armv7-unknown-linux-gnueabihf path: . - name: Install dependencies - run: | - yarn config set supportedArchitectures.cpu "arm" - yarn + run: npm install - name: Set up QEMU uses: docker/setup-qemu-action@v2 with: @@ -455,9 +442,9 @@ jobs: check-latest: true cache: npm - name: Install dependencies - run: yarn + run: npm install - name: Package - run: yarn prepublishOnly && npm pack + run: npm run prepublishOnly && npm pack env: GH_TOKEN: ${{ github.token }} - name: Upload artifact