Fix yarn version

This commit is contained in:
Adria Navarro 2023-11-17 17:44:50 +01:00
parent 52f2e5633c
commit 347b6ccd4e
2 changed files with 8 additions and 15 deletions

View File

@ -35,7 +35,7 @@ jobs:
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: 18.x node-version: 18.x
cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }} cache: yarn
- run: yarn --frozen-lockfile - run: yarn --frozen-lockfile
- run: yarn lint - run: yarn lint
@ -53,7 +53,7 @@ jobs:
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: 18.x node-version: 18.x
cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }} cache: yarn
- run: yarn --frozen-lockfile - run: yarn --frozen-lockfile
# Run build all the projects # Run build all the projects
@ -83,7 +83,7 @@ jobs:
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: 18.x node-version: 18.x
cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }} cache: yarn
- run: yarn --frozen-lockfile - run: yarn --frozen-lockfile
- name: Test - name: Test
run: | run: |
@ -112,7 +112,7 @@ jobs:
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: 18.x node-version: 18.x
cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }} cache: yarn
- run: yarn --frozen-lockfile - run: yarn --frozen-lockfile
- name: Test worker - name: Test worker
run: | run: |
@ -142,7 +142,7 @@ jobs:
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: 18.x node-version: 18.x
cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }} cache: yarn
- run: yarn --frozen-lockfile - run: yarn --frozen-lockfile
- name: Test server - name: Test server
run: | run: |
@ -173,7 +173,7 @@ jobs:
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: 18.x node-version: 18.x
cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }} cache: yarn
- run: yarn --frozen-lockfile - run: yarn --frozen-lockfile
- name: Test - name: Test
run: | run: |
@ -196,7 +196,7 @@ jobs:
uses: actions/setup-node@v3 uses: actions/setup-node@v3
with: with:
node-version: 18.x node-version: 18.x
cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }} cache: yarn
- run: yarn --frozen-lockfile - run: yarn --frozen-lockfile
- name: Build packages - name: Build packages
run: yarn build --scope @budibase/server --scope @budibase/worker run: yarn build --scope @budibase/server --scope @budibase/worker

View File

@ -5,14 +5,7 @@ const { execSync } = require("child_process")
let version = "0.0.0" let version = "0.0.0"
const localPro = fs.existsSync("packages/pro/src") const localPro = fs.existsSync("packages/pro/src")
if (!localPro) { if (!localPro) {
const branchName = execSync("git rev-parse --abbrev-ref HEAD")
.toString()
.trim()
if (branchName === "master") {
version = "latest" version = "latest"
} else {
version = "develop"
}
} }
// Get the list of workspaces with mismatched dependencies // Get the list of workspaces with mismatched dependencies