From b0cb1d423b8e4ae2fdc59c9eed1a805732fa2f84 Mon Sep 17 00:00:00 2001 From: Fraser Scott Date: Wed, 28 Feb 2024 15:26:27 +0000 Subject: [PATCH 1/8] chore: test runner uses matrix of ubuntu and windows --- .github/workflows/test.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index d61aae167f..6abd17bcef 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,7 +9,10 @@ on: jobs: test: name: Run tests - runs-on: ubuntu-latest-16-cores + strategy: + matrix: + os: [ubuntu-latest-16-cores, windows-latest-16-cores] + runs-on: ${{ matrix.os }} services: postgres: image: postgres:12.1-alpine From 7f92d1b1c525a715e8ea53cfae32fa5829afca65 Mon Sep 17 00:00:00 2001 From: Fraser Scott Date: Wed, 28 Feb 2024 15:32:15 +0000 Subject: [PATCH 2/8] fix: windows-latest --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 6abd17bcef..2ef607cbe4 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: name: Run tests strategy: matrix: - os: [ubuntu-latest-16-cores, windows-latest-16-cores] + os: [ubuntu-latest-16-cores, windows-latest] runs-on: ${{ matrix.os }} services: postgres: From d3341451534e72e7e981ba1ba6e6c92f15d2686e Mon Sep 17 00:00:00 2001 From: Fraser Scott Date: Wed, 28 Feb 2024 17:48:07 +0000 Subject: [PATCH 3/8] chore: add matrix to templates --- .github/workflows/templates.yml | 3 ++- .github/workflows/test.yml | 5 +---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/templates.yml b/.github/workflows/templates.yml index dfa26b9d35..ea0b47340c 100644 --- a/.github/workflows/templates.yml +++ b/.github/workflows/templates.yml @@ -14,11 +14,12 @@ env: jobs: build: name: Build template - runs-on: ubuntu-latest strategy: matrix: + os: [ubuntu-latest-16-cores, windows-latest] template: [vanilla, react, react-ecs, phaser, threejs] + runs-on: ${{ matrix.os }} steps: - name: Checkout uses: actions/checkout@v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2ef607cbe4..d61aae167f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,10 +9,7 @@ on: jobs: test: name: Run tests - strategy: - matrix: - os: [ubuntu-latest-16-cores, windows-latest] - runs-on: ${{ matrix.os }} + runs-on: ubuntu-latest-16-cores services: postgres: image: postgres:12.1-alpine From 64ec1249986d8d15f7cbed4965cc5fdca1dc7b92 Mon Sep 17 00:00:00 2001 From: Fraser Scott Date: Wed, 28 Feb 2024 17:55:23 +0000 Subject: [PATCH 4/8] fix: try mkdirp --- package.json | 1 + packages/abi-ts/package.json | 2 +- packages/cli/package.json | 2 +- packages/gas-report/package.json | 2 +- pnpm-lock.yaml | 9 +++++++++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 17c7bc3c33..ade885de8b 100644 --- a/package.json +++ b/package.json @@ -45,6 +45,7 @@ "execa": "^7.0.0", "husky": ">=6", "lint-staged": ">=10", + "mkdirp": "3.0.1", "prettier": "^2.8.4", "prettier-plugin-solidity": "1.1.3", "rimraf": "^3.0.2", diff --git a/packages/abi-ts/package.json b/packages/abi-ts/package.json index e0200e313c..64521027f4 100644 --- a/packages/abi-ts/package.json +++ b/packages/abi-ts/package.json @@ -26,7 +26,7 @@ "build": "tsup", "clean": "rimraf dist", "dev": "tsup --watch", - "prepare": "mkdir -p ./dist && touch ./dist/abi-ts.js", + "prepare": "mkdirp ./dist && touch ./dist/abi-ts.js", "test": "vitest typecheck --run --passWithNoTests && vitest --run --passWithNoTests", "test:ci": "pnpm run test" }, diff --git a/packages/cli/package.json b/packages/cli/package.json index 2c429e3b87..2a70439d1c 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -25,7 +25,7 @@ "clean:test-tables": "rimraf src/codegen", "dev": "tsup --watch", "lint": "eslint . --ext .ts", - "prepare": "mkdir -p ./dist && touch ./dist/mud.js", + "prepare": "mkdirp ./dist && touch ./dist/mud.js", "test": "tsc --noEmit && forge test", "test:ci": "pnpm run test" }, diff --git a/packages/gas-report/package.json b/packages/gas-report/package.json index d366a4dc25..61de592a7a 100644 --- a/packages/gas-report/package.json +++ b/packages/gas-report/package.json @@ -26,7 +26,7 @@ "build": "tsup", "clean": "rimraf dist", "dev": "tsup --watch", - "prepare": "mkdir -p ./dist && touch ./dist/gas-report.js", + "prepare": "mkdirp ./dist && touch ./dist/gas-report.js", "test": "vitest typecheck --run --passWithNoTests && vitest --run --passWithNoTests && forge test", "test:ci": "pnpm run test" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ebfc36e2f1..24f1855b8a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -38,6 +38,9 @@ importers: lint-staged: specifier: '>=10' version: 10.0.0 + mkdirp: + specifier: 3.0.1 + version: 3.0.1 prettier: specifier: ^2.8.4 version: 2.8.4 @@ -8121,6 +8124,12 @@ packages: hasBin: true dev: false + /mkdirp@3.0.1: + resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==} + engines: {node: '>=10'} + hasBin: true + dev: true + /mlly@1.5.0: resolution: {integrity: sha512-NPVQvAY1xr1QoVeG0cy8yUYC7FQcOx6evl/RjT1wL5FvzPnzOysoqB/jmx/DhssT2dYa8nxECLAaFI/+gVLhDQ==} dependencies: From bfb6a57b8aeba4a561887ea5ba059dd4f56672df Mon Sep 17 00:00:00 2001 From: Fraser Scott Date: Wed, 28 Feb 2024 18:01:06 +0000 Subject: [PATCH 5/8] fix: try pnpx --- packages/abi-ts/package.json | 2 +- packages/cli/package.json | 2 +- packages/gas-report/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/abi-ts/package.json b/packages/abi-ts/package.json index 64521027f4..548c1ac5b6 100644 --- a/packages/abi-ts/package.json +++ b/packages/abi-ts/package.json @@ -26,7 +26,7 @@ "build": "tsup", "clean": "rimraf dist", "dev": "tsup --watch", - "prepare": "mkdirp ./dist && touch ./dist/abi-ts.js", + "prepare": "pnpx mkdirp ./dist && touch ./dist/abi-ts.js", "test": "vitest typecheck --run --passWithNoTests && vitest --run --passWithNoTests", "test:ci": "pnpm run test" }, diff --git a/packages/cli/package.json b/packages/cli/package.json index 2a70439d1c..5f628e9331 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -25,7 +25,7 @@ "clean:test-tables": "rimraf src/codegen", "dev": "tsup --watch", "lint": "eslint . --ext .ts", - "prepare": "mkdirp ./dist && touch ./dist/mud.js", + "prepare": "pnpx mkdirp ./dist && touch ./dist/mud.js", "test": "tsc --noEmit && forge test", "test:ci": "pnpm run test" }, diff --git a/packages/gas-report/package.json b/packages/gas-report/package.json index 61de592a7a..0e7db55657 100644 --- a/packages/gas-report/package.json +++ b/packages/gas-report/package.json @@ -26,7 +26,7 @@ "build": "tsup", "clean": "rimraf dist", "dev": "tsup --watch", - "prepare": "mkdirp ./dist && touch ./dist/gas-report.js", + "prepare": "pnpx mkdirp ./dist && touch ./dist/gas-report.js", "test": "vitest typecheck --run --passWithNoTests && vitest --run --passWithNoTests && forge test", "test:ci": "pnpm run test" }, From ed6b4de1f0d05c0aa8d2538c2d909ae5515dd834 Mon Sep 17 00:00:00 2001 From: Fraser Scott Date: Wed, 28 Feb 2024 18:21:56 +0000 Subject: [PATCH 6/8] chore: test not running docs --- .github/workflows/build.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 17c98b7474..a7c94549f4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,10 +29,3 @@ jobs: - name: Outdated files, run `pnpm build` and commit them uses: ./.github/actions/require-empty-diff - - - name: Build API docs - shell: bash - run: pnpm docs:generate:api - - - name: Outdated files, run `pnpm docs:generate:api` and commit them - uses: ./.github/actions/require-empty-diff From e79bbc547c7c7b6b281cc714c7cf1d229c4c791b Mon Sep 17 00:00:00 2001 From: Fraser Scott Date: Wed, 28 Feb 2024 18:26:13 +0000 Subject: [PATCH 7/8] fix: do not install bun --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index ade885de8b..e619f1add3 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,6 @@ "@types/node": "^18.15.11", "@typescript-eslint/eslint-plugin": "5.46.1", "@typescript-eslint/parser": "5.46.1", - "bun": "^1.0.11", "chalk": "^5.2.0", "eslint": "8.29.0", "execa": "^7.0.0", From 7c136fe7ff0a58b359276db335d226f199b608c2 Mon Sep 17 00:00:00 2001 From: Fraser Scott Date: Wed, 28 Feb 2024 18:28:37 +0000 Subject: [PATCH 8/8] install --- pnpm-lock.yaml | 66 -------------------------------------------------- 1 file changed, 66 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 24f1855b8a..3dcdd47636 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,9 +20,6 @@ importers: '@typescript-eslint/parser': specifier: 5.46.1 version: 5.46.1(eslint@8.29.0)(typescript@5.1.6) - bun: - specifier: ^1.0.11 - version: 1.0.11 chalk: specifier: ^5.2.0 version: 5.2.0 @@ -2876,54 +2873,6 @@ packages: rimraf: 3.0.2 dev: false - /@oven/bun-darwin-aarch64@1.0.11: - resolution: {integrity: sha512-6wCO37lyGNcqefEDQ7IJp4LW7ElKMH50/hlvW5agIBN/XbTwwtv3788dJ9NczEV7RQSlkOI6J3dUoQJ6Pgav6w==} - cpu: [arm64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /@oven/bun-darwin-x64-baseline@1.0.11: - resolution: {integrity: sha512-is9liFB10GUN/UsSZVkO5tfMIJcBkiDqRvVzNkDHix/i5aXyaBb0vX+uOdJTlHDZyNGi+vHhbRMq3c3ezjJKPA==} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /@oven/bun-darwin-x64@1.0.11: - resolution: {integrity: sha512-5eCtrlOfMuhg7es/6p/rZw5+4khBao/hhGKCPHl9LBok1Mrf5QQjGbXj9OoA2RC2Lxm9av4nrAZG/5nMM01B2g==} - cpu: [x64] - os: [darwin] - requiresBuild: true - dev: true - optional: true - - /@oven/bun-linux-aarch64@1.0.11: - resolution: {integrity: sha512-P8hI+vQ+8ffsMLRi2TNzkxsHukrNQD8G2luWo/ndJ55+1uuAMScWZooxm9rgWL6baoB/TL9/Hvi/6INGoE8UlQ==} - cpu: [arm64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@oven/bun-linux-x64-baseline@1.0.11: - resolution: {integrity: sha512-Asx4pEMDXfmu9Sa0jX4PE1Wijtg1oCfUx8o4FeQEvnVz2+cGG+VoqZXuITmoQC6A4IzAZuJ1tcWOZ8jQCDtvJA==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - - /@oven/bun-linux-x64@1.0.11: - resolution: {integrity: sha512-F9ZcgVHsPQk6ooHXIeydiLcVcMwhGRjSlOVeHBuHEJ+bI24e/dCY73UKEEz8/hLNA32ocDMmkAGE79qv0ccEIA==} - cpu: [x64] - os: [linux] - requiresBuild: true - dev: true - optional: true - /@protobufjs/aspromise@1.1.2: resolution: {integrity: sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ==} @@ -4296,21 +4245,6 @@ packages: ieee754: 1.2.1 dev: false - /bun@1.0.11: - resolution: {integrity: sha512-cKyQAQOfWNIP511UpQjkABUp7z/5+1ci2kXfhjL9PozHoCaCtnYFtVjeqU1LovpqEP1agAsMiDpGNKbJP89RIw==} - cpu: [arm64, x64] - os: [darwin, linux] - hasBin: true - requiresBuild: true - optionalDependencies: - '@oven/bun-darwin-aarch64': 1.0.11 - '@oven/bun-darwin-x64': 1.0.11 - '@oven/bun-darwin-x64-baseline': 1.0.11 - '@oven/bun-linux-aarch64': 1.0.11 - '@oven/bun-linux-x64': 1.0.11 - '@oven/bun-linux-x64-baseline': 1.0.11 - dev: true - /bundle-require@4.0.1(esbuild@0.17.17): resolution: {integrity: sha512-9NQkRHlNdNpDBGmLpngF3EFDcwodhMUuLz9PaWYciVcQF9SE4LFjM2DB/xV1Li5JiuDMv7ZUWuC3rGbqR0MAXQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}