diff --git a/.github/workflows/beet-solana.yml b/.github/workflows/beet-solana.yml index 4e44093..b57e745 100644 --- a/.github/workflows/beet-solana.yml +++ b/.github/workflows/beet-solana.yml @@ -2,41 +2,40 @@ name: Build Lint and Test Beet Solana on: push: - branches: [ master ] + branches: [main] pull_request: - branches: [ master ] + branches: [main] jobs: build-lint-and-test-beet: - runs-on: ubuntu-latest strategy: matrix: - node-version: [14.x, 16.x] + node-version: [20.x] steps: - - uses: actions/checkout@v1 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} - - - name: yarn install in root - working-directory: ./ - run: | - yarn install - - - name: yarn build beet dependency - working-directory: ./beet - run: | - yarn run build - - - name: yarn build, lint and test - working-directory: ./beet-solana - run: | - yarn run build - yarn run lint - yarn run test - env: - CI: true + - uses: actions/checkout@v1 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} + + - name: yarn install in root + working-directory: ./ + run: | + yarn install + + - name: yarn build beet dependency + working-directory: ./beet + run: | + yarn run build + + - name: yarn build, lint and test + working-directory: ./beet-solana + run: | + yarn run build + yarn run lint + yarn run test + env: + CI: true diff --git a/.github/workflows/beet.yml b/.github/workflows/beet.yml index fc21c6e..ede1bab 100644 --- a/.github/workflows/beet.yml +++ b/.github/workflows/beet.yml @@ -2,37 +2,36 @@ name: Build Lint and Test Beet on: push: - branches: [ master ] + branches: [main] pull_request: - branches: [ master ] + branches: [main] jobs: build-lint-and-test-beet: - runs-on: ubuntu-latest strategy: matrix: - node-version: [14.x, 16.x] + node-version: [20.x] steps: - - uses: actions/checkout@v1 - - name: Use Node.js ${{ matrix.node-version }} - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.node-version }} + - uses: actions/checkout@v1 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v1 + with: + node-version: ${{ matrix.node-version }} - - name: yarn install in root - working-directory: ./ - run: | - yarn install + - name: yarn install in root + working-directory: ./ + run: | + yarn install - - name: yarn build, lint and test - working-directory: ./beet - run: | - yarn run build - yarn run lint - yarn run test - yarn run test:browser - env: - CI: true + - name: yarn build, lint and test + working-directory: ./beet + run: | + yarn run build + yarn run lint + yarn run test + yarn run test:browser + env: + CI: true diff --git a/package.json b/package.json index 99305e6..1899628 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ "url": "https://github.com/metaplex/beet.git" }, "private": true, - "packageManager": "yarn@3.1.1", "devDependencies": { "patch-package": "^6.4.7" } diff --git a/sh/update-docs b/sh/update-docs index 85f7f35..1f923a4 100755 --- a/sh/update-docs +++ b/sh/update-docs @@ -1,6 +1,6 @@ #!/usr/bin/env sh -MAIN_BRANCH='master' +MAIN_BRANCH='main' CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD) if [[ $CURRENT_BRANCH != $MAIN_BRANCH ]]; then