Skip to content

Commit

Permalink
fix: remove dir test and use npm instead of yarn
Browse files Browse the repository at this point in the history 
Signed-off-by: Trae Yelovich <trae.yelovich@broadcom.com>
  • Loading branch information
@traeok
traeok committed Jul 24, 2023
1 parent 21bb5a3 commit df5e4b6
Showing 1 changed file with 24 additions and 37 deletions.
61 changes: 24 additions & 37 deletions .github/workflows/secrets-sdk.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit df5e4b6

Please sign in to comment.