From e4e8f2edae9f29ef2e979380b2444040787af6fa Mon Sep 17 00:00:00 2001 From: Ted Patrick Date: Tue, 20 Jun 2023 12:17:08 -0500 Subject: [PATCH] Fix build unstable to run on ubuntu-latest-8core (#1549) * Fix build unstable to run on ubuntu-latest-8core * ubuntu-latest to ubuntu-latest-8core --- .github/workflows/build-unstable.yml | 4 ++-- .github/workflows/docs-release.yml | 2 +- .github/workflows/docs-review.yml | 2 +- .github/workflows/docs-unstable.yml | 2 +- .github/workflows/publish-snapshot.yml | 2 +- .github/workflows/sync-examples.yml | 2 +- .github/workflows/test-next.yml | 2 +- .github/workflows/test_report.yml | 2 +- pyscriptjs/package-lock.json | 20 ++++++++++---------- pyscriptjs/package.json | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build-unstable.yml b/.github/workflows/build-unstable.yml index e27303e4..335dccd1 100644 --- a/.github/workflows/build-unstable.yml +++ b/.github/workflows/build-unstable.yml @@ -85,7 +85,7 @@ jobs: path: pyscriptjs/test_results if-no-files-found: error eslint: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-8core defaults: run: working-directory: pyscriptjs @@ -118,7 +118,7 @@ jobs: run: npx eslint src -c .eslintrc.js Deploy: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-8core needs: BuildAndTest if: github.ref == 'refs/heads/main' # Only deploy on merge into main permissions: diff --git a/.github/workflows/docs-release.yml b/.github/workflows/docs-release.yml index 2978d7a9..3d34d40b 100644 --- a/.github/workflows/docs-release.yml +++ b/.github/workflows/docs-release.yml @@ -6,7 +6,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-8core permissions: contents: read id-token: write diff --git a/.github/workflows/docs-review.yml b/.github/workflows/docs-review.yml index 37ba5b13..5054d4e0 100644 --- a/.github/workflows/docs-review.yml +++ b/.github/workflows/docs-review.yml @@ -19,7 +19,7 @@ concurrency: jobs: build: if: github.repository_owner == 'pyscript' - runs-on: ubuntu-latest + runs-on: ubuntu-latest-8core permissions: contents: read id-token: write diff --git a/.github/workflows/docs-unstable.yml b/.github/workflows/docs-unstable.yml index 0d093db5..9ad28948 100644 --- a/.github/workflows/docs-unstable.yml +++ b/.github/workflows/docs-unstable.yml @@ -9,7 +9,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-8core permissions: contents: read id-token: write diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index e2ef5c98..daa12b37 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -11,7 +11,7 @@ on: jobs: snapshot: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-8core permissions: contents: read id-token: write diff --git a/.github/workflows/sync-examples.yml b/.github/workflows/sync-examples.yml index d8ed32b8..deb56f63 100644 --- a/.github/workflows/sync-examples.yml +++ b/.github/workflows/sync-examples.yml @@ -6,7 +6,7 @@ on: jobs: build: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-8core permissions: contents: read id-token: write diff --git a/.github/workflows/test-next.yml b/.github/workflows/test-next.yml index c8b50b33..a0c6652e 100644 --- a/.github/workflows/test-next.yml +++ b/.github/workflows/test-next.yml @@ -95,7 +95,7 @@ jobs: path: pyscriptjs/test_results if-no-files-found: error eslint: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-8core defaults: run: working-directory: pyscriptjs diff --git a/.github/workflows/test_report.yml b/.github/workflows/test_report.yml index dacbc8e7..7ffca86b 100644 --- a/.github/workflows/test_report.yml +++ b/.github/workflows/test_report.yml @@ -6,7 +6,7 @@ on: - completed jobs: report: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-8core steps: - uses: dorny/test-reporter@v1.6.0 with: diff --git a/pyscriptjs/package-lock.json b/pyscriptjs/package-lock.json index 50639199..5b291a15 100644 --- a/pyscriptjs/package-lock.json +++ b/pyscriptjs/package-lock.json @@ -34,7 +34,7 @@ "prettier": "2.7.1", "pyodide": "0.23.2", "synclink": "0.2.4", - "ts-jest": "29.0.3", + "ts-jest": "29.1.0", "typescript": "5.0.4", "xterm": "^5.1.0" } @@ -5674,15 +5674,15 @@ } }, "node_modules/ts-jest": { - "version": "29.0.3", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.0.3.tgz", - "integrity": "sha512-Ibygvmuyq1qp/z3yTh9QTwVVAbFdDy/+4BtIQR2sp6baF2SJU/8CKK/hhnGIDY2L90Az2jIqTwZPnN2p+BweiQ==", + "version": "29.1.0", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.0.tgz", + "integrity": "sha512-ZhNr7Z4PcYa+JjMl62ir+zPiNJfXJN6E8hSLnaUKhOgqcn8vb3e537cpkd0FuAfRK3sR1LSqM1MOhliXNgOFPA==", "dev": true, "dependencies": { "bs-logger": "0.x", "fast-json-stable-stringify": "2.x", "jest-util": "^29.0.0", - "json5": "^2.2.1", + "json5": "^2.2.3", "lodash.memoize": "4.x", "make-error": "1.x", "semver": "7.x", @@ -5699,7 +5699,7 @@ "@jest/types": "^29.0.0", "babel-jest": "^29.0.0", "jest": "^29.0.0", - "typescript": ">=4.3" + "typescript": ">=4.3 <6" }, "peerDependenciesMeta": { "@babel/core": { @@ -10247,15 +10247,15 @@ } }, "ts-jest": { - "version": "29.0.3", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.0.3.tgz", - "integrity": "sha512-Ibygvmuyq1qp/z3yTh9QTwVVAbFdDy/+4BtIQR2sp6baF2SJU/8CKK/hhnGIDY2L90Az2jIqTwZPnN2p+BweiQ==", + "version": "29.1.0", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-29.1.0.tgz", + "integrity": "sha512-ZhNr7Z4PcYa+JjMl62ir+zPiNJfXJN6E8hSLnaUKhOgqcn8vb3e537cpkd0FuAfRK3sR1LSqM1MOhliXNgOFPA==", "dev": true, "requires": { "bs-logger": "0.x", "fast-json-stable-stringify": "2.x", "jest-util": "^29.0.0", - "json5": "^2.2.1", + "json5": "^2.2.3", "lodash.memoize": "4.x", "make-error": "1.x", "semver": "7.x", diff --git a/pyscriptjs/package.json b/pyscriptjs/package.json index a86c47d3..02447af1 100644 --- a/pyscriptjs/package.json +++ b/pyscriptjs/package.json @@ -36,7 +36,7 @@ "prettier": "2.7.1", "pyodide": "0.23.2", "synclink": "0.2.4", - "ts-jest": "29.0.3", + "ts-jest": "29.1.0", "typescript": "5.0.4", "xterm": "^5.1.0" },