diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml index d68e9d4aa1..cb71d0702b 100644 --- a/.github/workflows/budibase_ci.yml +++ b/.github/workflows/budibase_ci.yml @@ -35,7 +35,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: 18.x - cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }} + cache: yarn - run: yarn --frozen-lockfile - run: yarn lint @@ -53,7 +53,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: 18.x - cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }} + cache: yarn - run: yarn --frozen-lockfile # Run build all the projects @@ -83,7 +83,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: 18.x - cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }} + cache: yarn - run: yarn --frozen-lockfile - name: Test run: | @@ -112,7 +112,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: 18.x - cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }} + cache: yarn - run: yarn --frozen-lockfile - name: Test worker run: | @@ -142,7 +142,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: 18.x - cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }} + cache: yarn - run: yarn --frozen-lockfile - name: Test server run: | @@ -173,7 +173,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: 18.x - cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }} + cache: yarn - run: yarn --frozen-lockfile - name: Test run: | @@ -196,7 +196,7 @@ jobs: uses: actions/setup-node@v3 with: node-version: 18.x - cache: ${{ env.IS_OSS_CONTRIBUTOR == 'false' && 'yarn' || '' }} + cache: yarn - run: yarn --frozen-lockfile - name: Build packages run: yarn build --scope @budibase/server --scope @budibase/worker diff --git a/scripts/syncProPackage.js b/scripts/syncProPackage.js index 46a55c291b..14ee222ce7 100755 --- a/scripts/syncProPackage.js +++ b/scripts/syncProPackage.js @@ -5,14 +5,7 @@ const { execSync } = require("child_process") let version = "0.0.0" const localPro = fs.existsSync("packages/pro/src") if (!localPro) { - const branchName = execSync("git rev-parse --abbrev-ref HEAD") - .toString() - .trim() - if (branchName === "master") { - version = "latest" - } else { - version = "develop" - } + version = "latest" } // Get the list of workspaces with mismatched dependencies