diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6ad05c14c..eb3a8a755 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,9 +33,13 @@ jobs: node-version: "18" cache: 'yarn' - # Use Turborepo Remote Caching - - name: Setup Turborepo Remote Cache - uses: dtinth/setup-github-actions-caching-for-turbo@v1 + - name: Setup Turborepo cache + uses: actions/cache@v3 + with: + path: .turbo + key: ${{ runner.os }}-turbo-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-turbo- - name: Install dependencies run: yarn install --frozen-lockfile @@ -43,24 +47,27 @@ jobs: YARN_ENABLE_IMMUTABLE_INSTALLS: false - name: Run lint, type checks and tests - run: yarn verify --cache-dir=".turbo" + run: yarn verify env: - TURBO_CACHE_KEY: ${{ github.sha }} + TURBO_REMOTE_ONLY: false + TURBO_CACHE_DIR: .turbo - name: Build packages run: | yarn turbo run build \ --cache-dir=".turbo" \ - --concurrency=5 \ + --concurrency=8 \ --no-daemon env: - TURBO_CACHE_KEY: ${{ github.sha }} + TURBO_REMOTE_ONLY: false - name: Upload build artifacts uses: actions/upload-artifact@v4 with: name: packages - path: packages/**/dist + path: | + packages/**/dist + !packages/**/node_modules compression-level: 9 retention-days: 7 @@ -90,9 +97,10 @@ jobs: run: yarn workspaces foreach --worktree --topological --exclude @kenyaemr/esm-3.x-apps version "$(node -e "console.log(require('semver').inc(require('./package.json').version, 'patch'))")-pre.${{ github.run_number }}" - name: Build - run: yarn turbo run build --cache-dir=".turbo" --concurrency=5 --no-daemon + run: yarn turbo run build --cache-dir=".turbo" --concurrency=8 --no-daemon env: TURBO_CACHE_KEY: ${{ github.sha }} + TURBO_TEAM: ${{ github.repository_owner }} - name: Configure Git run: | diff --git a/package.json b/package.json index 48295e7ad..401c6651f 100644 --- a/package.json +++ b/package.json @@ -91,7 +91,7 @@ "sass": "^1.54.3", "swc-loader": "^0.2.3", "swr": "^2.2.4", - "turbo": "^2.1.3", + "turbo": "^2.3.4", "typescript": "^4.0.3", "uuid": "^9.0.1", "webpack-cli": "^4.10.0", diff --git a/yarn.lock b/yarn.lock index 4711f2ad1..f5e9e62af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2731,7 +2731,7 @@ __metadata: swc-loader: "npm:^0.2.3" swr: "npm:^2.2.4" ts-dotenv: "npm:^0.9.1" - turbo: "npm:^2.1.3" + turbo: "npm:^2.3.4" typescript: "npm:^4.0.3" uuid: "npm:^9.0.1" webpack-cli: "npm:^4.10.0" @@ -18594,58 +18594,58 @@ __metadata: languageName: node linkType: hard -"turbo-darwin-64@npm:2.1.3": - version: 2.1.3 - resolution: "turbo-darwin-64@npm:2.1.3" +"turbo-darwin-64@npm:2.3.4": + version: 2.3.4 + resolution: "turbo-darwin-64@npm:2.3.4" conditions: os=darwin & cpu=x64 languageName: node linkType: hard -"turbo-darwin-arm64@npm:2.1.3": - version: 2.1.3 - resolution: "turbo-darwin-arm64@npm:2.1.3" +"turbo-darwin-arm64@npm:2.3.4": + version: 2.3.4 + resolution: "turbo-darwin-arm64@npm:2.3.4" conditions: os=darwin & cpu=arm64 languageName: node linkType: hard -"turbo-linux-64@npm:2.1.3": - version: 2.1.3 - resolution: "turbo-linux-64@npm:2.1.3" +"turbo-linux-64@npm:2.3.4": + version: 2.3.4 + resolution: "turbo-linux-64@npm:2.3.4" conditions: os=linux & cpu=x64 languageName: node linkType: hard -"turbo-linux-arm64@npm:2.1.3": - version: 2.1.3 - resolution: "turbo-linux-arm64@npm:2.1.3" +"turbo-linux-arm64@npm:2.3.4": + version: 2.3.4 + resolution: "turbo-linux-arm64@npm:2.3.4" conditions: os=linux & cpu=arm64 languageName: node linkType: hard -"turbo-windows-64@npm:2.1.3": - version: 2.1.3 - resolution: "turbo-windows-64@npm:2.1.3" +"turbo-windows-64@npm:2.3.4": + version: 2.3.4 + resolution: "turbo-windows-64@npm:2.3.4" conditions: os=win32 & cpu=x64 languageName: node linkType: hard -"turbo-windows-arm64@npm:2.1.3": - version: 2.1.3 - resolution: "turbo-windows-arm64@npm:2.1.3" +"turbo-windows-arm64@npm:2.3.4": + version: 2.3.4 + resolution: "turbo-windows-arm64@npm:2.3.4" conditions: os=win32 & cpu=arm64 languageName: node linkType: hard -"turbo@npm:^2.1.3": - version: 2.1.3 - resolution: "turbo@npm:2.1.3" - dependencies: - turbo-darwin-64: "npm:2.1.3" - turbo-darwin-arm64: "npm:2.1.3" - turbo-linux-64: "npm:2.1.3" - turbo-linux-arm64: "npm:2.1.3" - turbo-windows-64: "npm:2.1.3" - turbo-windows-arm64: "npm:2.1.3" +"turbo@npm:^2.3.4": + version: 2.3.4 + resolution: "turbo@npm:2.3.4" + dependencies: + turbo-darwin-64: "npm:2.3.4" + turbo-darwin-arm64: "npm:2.3.4" + turbo-linux-64: "npm:2.3.4" + turbo-linux-arm64: "npm:2.3.4" + turbo-windows-64: "npm:2.3.4" + turbo-windows-arm64: "npm:2.3.4" dependenciesMeta: turbo-darwin-64: optional: true @@ -18661,7 +18661,7 @@ __metadata: optional: true bin: turbo: bin/turbo - checksum: 10/b8e90a38f47dc5c07e5f1c0bd708f9dc6b00b744847a45c06e5de5a5379a32bb155e8ad994eb03e60f697afc87f0815dd02fc680e22c0fad83d65c0a1fb6fc96 + checksum: 10/e1ea94c1977c7d907dff50796b09dca8dc4713590ef0f3a5697abb2de41b9a465e6ca25b8d417d12cadb4db5e65a2c247dd60486c85eaaf69a1888ff9f0d604a languageName: node linkType: hard