Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 27 additions & 28 deletions .github/workflows/beet-solana.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
43 changes: 21 additions & 22 deletions .github/workflows/beet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"url": "https://github.com/metaplex/beet.git"
},
"private": true,
"packageManager": "yarn@3.1.1",
"devDependencies": {
"patch-package": "^6.4.7"
}
Expand Down
2 changes: 1 addition & 1 deletion sh/update-docs
Original file line number Diff line number Diff line change
@@ -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
Expand Down