diff --git a/.github/workflows/bedrock-release.yaml b/.github/workflows/bedrock-release.yaml index a701cd40..0f05b146 100644 --- a/.github/workflows/bedrock-release.yaml +++ b/.github/workflows/bedrock-release.yaml @@ -5,6 +5,8 @@ on: - main paths: - bedrock/** + paths-ignore: + - bedrock/package-lock.json jobs: build-bedrock: runs-on: ubuntu-latest diff --git a/.github/workflows/canary.yaml b/.github/workflows/canary.yaml index e69e5c3b..8f39d30d 100644 --- a/.github/workflows/canary.yaml +++ b/.github/workflows/canary.yaml @@ -15,7 +15,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 18.x + node-version: 20.x registry-url: https://registry.npmjs.org - name: Install winglang run: npm i -g winglang @@ -36,7 +36,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 18.x + node-version: 20.x registry-url: https://registry.npmjs.org - name: Install winglang run: npm i -g winglang @@ -46,27 +46,6 @@ jobs: - name: Test run: wing test working-directory: checks - canary-containers: - name: Test containers - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v3 - with: - sparse-checkout: containers - - name: Setup Node.js - uses: actions/setup-node@v3 - with: - node-version: 18.x - registry-url: https://registry.npmjs.org - - name: Install winglang - run: npm i -g winglang - - name: Install dependencies - run: npm install --include=dev - working-directory: containers - - name: Test - run: wing test - working-directory: containers canary-fifoqueue: name: Test fifoqueue runs-on: ubuntu-latest @@ -78,7 +57,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 18.x + node-version: 20.x registry-url: https://registry.npmjs.org - name: Install winglang run: npm i -g winglang @@ -99,7 +78,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 18.x + node-version: 20.x registry-url: https://registry.npmjs.org - name: Install winglang run: npm i -g winglang @@ -120,7 +99,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 18.x + node-version: 20.x registry-url: https://registry.npmjs.org - name: Install winglang run: npm i -g winglang @@ -141,7 +120,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 18.x + node-version: 20.x registry-url: https://registry.npmjs.org - name: Install winglang run: npm i -g winglang @@ -162,7 +141,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 18.x + node-version: 20.x registry-url: https://registry.npmjs.org - name: Install winglang run: npm i -g winglang @@ -183,7 +162,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 18.x + node-version: 20.x registry-url: https://registry.npmjs.org - name: Install winglang run: npm i -g winglang @@ -204,7 +183,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v3 with: - node-version: 18.x + node-version: 20.x registry-url: https://registry.npmjs.org - name: Install winglang run: npm i -g winglang diff --git a/.github/workflows/checks-release.yaml b/.github/workflows/checks-release.yaml index b8b6ac5e..0296264a 100644 --- a/.github/workflows/checks-release.yaml +++ b/.github/workflows/checks-release.yaml @@ -5,6 +5,8 @@ on: - main paths: - checks/** + paths-ignore: + - checks/package-lock.json jobs: build-checks: runs-on: ubuntu-latest diff --git a/.github/workflows/containers-release.yaml b/.github/workflows/containers-release.yaml index 70bdc7e0..9f3db2bb 100644 --- a/.github/workflows/containers-release.yaml +++ b/.github/workflows/containers-release.yaml @@ -5,6 +5,8 @@ on: - main paths: - containers/** + paths-ignore: + - containers/package-lock.json jobs: build-containers: runs-on: ubuntu-latest diff --git a/.github/workflows/fifoqueue-release.yaml b/.github/workflows/fifoqueue-release.yaml index 7e890257..b4274a46 100644 --- a/.github/workflows/fifoqueue-release.yaml +++ b/.github/workflows/fifoqueue-release.yaml @@ -5,6 +5,8 @@ on: - main paths: - fifoqueue/** + paths-ignore: + - fifoqueue/package-lock.json jobs: build-fifoqueue: runs-on: ubuntu-latest diff --git a/.github/workflows/github-release.yaml b/.github/workflows/github-release.yaml index 7aea3c70..b2f78f12 100644 --- a/.github/workflows/github-release.yaml +++ b/.github/workflows/github-release.yaml @@ -5,6 +5,8 @@ on: - main paths: - github/** + paths-ignore: + - github/package-lock.json jobs: build-github: runs-on: ubuntu-latest diff --git a/.github/workflows/ngrok-release.yaml b/.github/workflows/ngrok-release.yaml index 3f6b77f4..7dc2296b 100644 --- a/.github/workflows/ngrok-release.yaml +++ b/.github/workflows/ngrok-release.yaml @@ -5,6 +5,8 @@ on: - main paths: - ngrok/** + paths-ignore: + - ngrok/package-lock.json jobs: build-ngrok: runs-on: ubuntu-latest diff --git a/.github/workflows/postgres-release.yaml b/.github/workflows/postgres-release.yaml index b87bdd89..2f7f0deb 100644 --- a/.github/workflows/postgres-release.yaml +++ b/.github/workflows/postgres-release.yaml @@ -5,6 +5,8 @@ on: - main paths: - postgres/** + paths-ignore: + - postgres/package-lock.json jobs: build-postgres: runs-on: ubuntu-latest diff --git a/.github/workflows/redis-release.yaml b/.github/workflows/redis-release.yaml index 21d64019..e09d48e7 100644 --- a/.github/workflows/redis-release.yaml +++ b/.github/workflows/redis-release.yaml @@ -5,6 +5,8 @@ on: - main paths: - redis/** + paths-ignore: + - redis/package-lock.json jobs: build-redis: runs-on: ubuntu-latest diff --git a/.github/workflows/sagemaker-release.yaml b/.github/workflows/sagemaker-release.yaml index 0db46b96..d4c8269e 100644 --- a/.github/workflows/sagemaker-release.yaml +++ b/.github/workflows/sagemaker-release.yaml @@ -5,6 +5,8 @@ on: - main paths: - sagemaker/** + paths-ignore: + - sagemaker/package-lock.json jobs: build-sagemaker: runs-on: ubuntu-latest diff --git a/.github/workflows/websockets-release.yaml b/.github/workflows/websockets-release.yaml index e5a9d2e8..f6416a70 100644 --- a/.github/workflows/websockets-release.yaml +++ b/.github/workflows/websockets-release.yaml @@ -5,6 +5,8 @@ on: - main paths: - websockets/** + paths-ignore: + - websockets/package-lock.json jobs: build-websockets: runs-on: ubuntu-latest diff --git a/canary.w b/canary.w index 2fb8f256..354189bf 100644 --- a/canary.w +++ b/canary.w @@ -1,7 +1,7 @@ bring fs; pub class CanaryWorkflow { - new(workflowdir: str, libs: Array) { + new(workflowdir: str, libs: Array, skipLibs: Array?) { let testLibSteps = (lib: str): Array => { return [ { @@ -15,7 +15,7 @@ pub class CanaryWorkflow { name: "Setup Node.js", uses: "actions/setup-node@v3", with: { - "node-version": "18.x", + "node-version": "20.x", "registry-url": "https://registry.npmjs.org", }, }, @@ -38,6 +38,9 @@ pub class CanaryWorkflow { let jobs = MutJson {}; for lib in libs { + if (skipLibs ?? []).contains(lib) { + continue; + } jobs.set("canary-{lib}", { name: "Test {lib}", "runs-on": "ubuntu-latest", diff --git a/checks/package-lock.json b/checks/package-lock.json index b3546245..f4057063 100644 --- a/checks/package-lock.json +++ b/checks/package-lock.json @@ -1,12 +1,12 @@ { "name": "@winglibs/checks", - "version": "0.0.6", + "version": "0.0.7", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@winglibs/checks", - "version": "0.0.6", + "version": "0.0.7", "license": "MIT" }, "node_modules/.pnpm/constructs@10.0.0/node_modules/constructs": { diff --git a/containers/package-lock.json b/containers/package-lock.json index 3e527885..5a1aa38e 100644 --- a/containers/package-lock.json +++ b/containers/package-lock.json @@ -1,12 +1,12 @@ { "name": "@winglibs/containers", - "version": "0.0.20", + "version": "0.0.21", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@winglibs/containers", - "version": "0.0.20", + "version": "0.0.21", "license": "MIT", "dependencies": { "@cdktf/provider-aws": "^18.0.5", diff --git a/containers/package.json b/containers/package.json index 69373395..a36a3b4f 100644 --- a/containers/package.json +++ b/containers/package.json @@ -1,6 +1,6 @@ { "name": "@winglibs/containers", - "version": "0.0.20", + "version": "0.0.21", "description": "Container support for Wing", "repository": { "type": "git", diff --git a/fifoqueue/package-lock.json b/fifoqueue/package-lock.json index 1e9bbc82..5148e430 100644 --- a/fifoqueue/package-lock.json +++ b/fifoqueue/package-lock.json @@ -1,12 +1,12 @@ { "name": "@winglibs/fifoqueue", - "version": "0.0.2", + "version": "0.0.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@winglibs/fifoqueue", - "version": "0.0.2", + "version": "0.0.3", "license": "MIT", "dependencies": { "@aws-sdk/client-sqs": "^3.460.0", diff --git a/generate-workflows.main.w b/generate-workflows.main.w index 7a7c22b2..9a8bb3b9 100644 --- a/generate-workflows.main.w +++ b/generate-workflows.main.w @@ -26,4 +26,9 @@ for file in fs.readdir(".") { new stale.StaleWorkflow(workflowdir); new mergify.MergifyWorkflow(libs.copy()); new prlint.PullRequestLintWorkflow(workflowdir); -new canary.CanaryWorkflow(workflowdir, libs.copy()); + +let skipCanaryTests = [ + "containers" // https://github.com/winglang/wing/issues/5716 +]; + +new canary.CanaryWorkflow(workflowdir, libs.copy(), skipCanaryTests); diff --git a/github/package-lock.json b/github/package-lock.json index 473924a5..0f37db40 100644 --- a/github/package-lock.json +++ b/github/package-lock.json @@ -1,12 +1,12 @@ { "name": "@winglibs/github", - "version": "0.0.4", + "version": "0.0.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@winglibs/github", - "version": "0.0.4", + "version": "0.0.5", "license": "MIT", "dependencies": { "@probot/adapter-aws-lambda-serverless": "^3.0.4", diff --git a/library.w b/library.w index 4e62eb04..488a14fe 100644 --- a/library.w +++ b/library.w @@ -113,7 +113,8 @@ pub class Library { on: { push: { branches: ["main"], - paths: ["{libdir}/**"] + paths: ["{libdir}/**"], + "paths-ignore": ["{libdir}/package-lock.json"], } }, jobs: Json.deepCopy(releaseJobs), @@ -128,7 +129,7 @@ pub class Library { name: "{base}-pull", on: { pull_request: { - paths: ["{libdir}/**"] + paths: ["{libdir}/**"], } }, jobs: Json.deepCopy(pullJobs), diff --git a/ngrok/package-lock.json b/ngrok/package-lock.json index 367e2b52..77fdd6fd 100644 --- a/ngrok/package-lock.json +++ b/ngrok/package-lock.json @@ -1,12 +1,12 @@ { "name": "@winglibs/ngrok", - "version": "0.0.1", + "version": "0.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@winglibs/ngrok", - "version": "0.0.1", + "version": "0.0.2", "license": "MIT", "dependencies": { "@ngrok/ngrok": "^0.9.1" diff --git a/postgres/package-lock.json b/postgres/package-lock.json index 7c7fce63..e7745e0d 100644 --- a/postgres/package-lock.json +++ b/postgres/package-lock.json @@ -597,6 +597,15 @@ "@octokit/openapi-types": "^12.11.0" } }, + "node_modules/@opentelemetry/api": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.7.0.tgz", + "integrity": "sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw==", + "peer": true, + "engines": { + "node": ">=8.0.0" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -9679,6 +9688,7 @@ "version": "2.4.3", "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz", "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==", + "optional": true, "engines": { "node": ">=10" } diff --git a/redis/package-lock.json b/redis/package-lock.json index 9e511a4a..e019b384 100644 --- a/redis/package-lock.json +++ b/redis/package-lock.json @@ -799,6 +799,15 @@ "@octokit/openapi-types": "^12.11.0" } }, + "node_modules/@opentelemetry/api": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.7.0.tgz", + "integrity": "sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw==", + "peer": true, + "engines": { + "node": ">=8.0.0" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -9838,6 +9847,7 @@ "version": "2.4.3", "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz", "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==", + "optional": true, "engines": { "node": ">=10" } @@ -11424,6 +11434,11 @@ "@octokit/openapi-types": "^12.11.0" } }, + "@opentelemetry/api": { + "version": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.7.0.tgz", + "integrity": "sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw==", + "peer": true + }, "@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -18009,7 +18024,8 @@ "safe-stable-stringify": { "version": "2.4.3", "resolved": "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz", - "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==" + "integrity": "sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g==", + "optional": true }, "safer-buffer": { "version": "2.1.2", diff --git a/sagemaker/package-lock.json b/sagemaker/package-lock.json index e8469208..cc698a8b 100644 --- a/sagemaker/package-lock.json +++ b/sagemaker/package-lock.json @@ -1,12 +1,12 @@ { "name": "@winglibs/sagemaker", - "version": "0.0.1", + "version": "0.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@winglibs/sagemaker", - "version": "0.0.1", + "version": "0.0.2", "license": "MIT", "dependencies": { "@aws-sdk/client-sagemaker-runtime": "^3.507.0" diff --git a/test-all.sh b/test-all.sh index 9bef4483..beb0e2b5 100755 --- a/test-all.sh +++ b/test-all.sh @@ -9,7 +9,7 @@ for i in $(ls -F); do ( cd $i npm i - wing test **/*.test.w + wing test ) fi -done \ No newline at end of file +done diff --git a/websockets/package-lock.json b/websockets/package-lock.json index 56c676a0..faeb2426 100644 --- a/websockets/package-lock.json +++ b/websockets/package-lock.json @@ -885,6 +885,15 @@ "node": "^16.14.0 || >=18.0.0" } }, + "node_modules/@opentelemetry/api": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.7.0.tgz", + "integrity": "sha512-AdY5wvN0P2vXBi3b29hxZgSFvdhdxPB9+f0B6s//P9Q8nibRWeA3cHm8UmLpio9ABigkVHJ5NMPk+Mz8VCCyrw==", + "peer": true, + "engines": { + "node": ">=8.0.0" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",