Skip to content

Commit

Permalink
Merge branch 'main' into add-vite-resource
Browse files Browse the repository at this point in the history
  • Loading branch information
skyrpex authored Feb 19, 2024
2 parents 3e8975b + 7d549c1 commit 209659b
Show file tree
Hide file tree
Showing 25 changed files with 94 additions and 51 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/bedrock-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
- main
paths:
- bedrock/**
paths-ignore:
- bedrock/package-lock.json
jobs:
build-bedrock:
runs-on: ubuntu-latest
Expand Down
39 changes: 9 additions & 30 deletions .github/workflows/canary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/checks-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
- main
paths:
- checks/**
paths-ignore:
- checks/package-lock.json
jobs:
build-checks:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/containers-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
- main
paths:
- containers/**
paths-ignore:
- containers/package-lock.json
jobs:
build-containers:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/fifoqueue-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
- main
paths:
- fifoqueue/**
paths-ignore:
- fifoqueue/package-lock.json
jobs:
build-fifoqueue:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/github-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
- main
paths:
- github/**
paths-ignore:
- github/package-lock.json
jobs:
build-github:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/ngrok-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
- main
paths:
- ngrok/**
paths-ignore:
- ngrok/package-lock.json
jobs:
build-ngrok:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/postgres-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
- main
paths:
- postgres/**
paths-ignore:
- postgres/package-lock.json
jobs:
build-postgres:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/redis-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
- main
paths:
- redis/**
paths-ignore:
- redis/package-lock.json
jobs:
build-redis:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/sagemaker-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
- main
paths:
- sagemaker/**
paths-ignore:
- sagemaker/package-lock.json
jobs:
build-sagemaker:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/websockets-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
- main
paths:
- websockets/**
paths-ignore:
- websockets/package-lock.json
jobs:
build-websockets:
runs-on: ubuntu-latest
Expand Down
7 changes: 5 additions & 2 deletions canary.w
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
bring fs;

pub class CanaryWorkflow {
new(workflowdir: str, libs: Array<str>) {
new(workflowdir: str, libs: Array<str>, skipLibs: Array<str>?) {
let testLibSteps = (lib: str): Array<Json> => {
return [
{
Expand All @@ -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",
},
},
Expand All @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions checks/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions containers/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion containers/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@winglibs/containers",
"version": "0.0.20",
"version": "0.0.21",
"description": "Container support for Wing",
"repository": {
"type": "git",
Expand Down
4 changes: 2 additions & 2 deletions fifoqueue/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion generate-workflows.main.w
Original file line number Diff line number Diff line change
Expand Up @@ -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);
4 changes: 2 additions & 2 deletions github/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions library.w
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -128,7 +129,7 @@ pub class Library {
name: "{base}-pull",
on: {
pull_request: {
paths: ["{libdir}/**"]
paths: ["{libdir}/**"],
}
},
jobs: Json.deepCopy(pullJobs),
Expand Down
4 changes: 2 additions & 2 deletions ngrok/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions postgres/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 209659b

Please sign in to comment.