From 17af3841b09b84f2f69bea05c7a0451368788194 Mon Sep 17 00:00:00 2001 From: Pinta365 Date: Wed, 20 Mar 2024 19:43:09 +0100 Subject: [PATCH 1/5] workflow change: publish after tests --- .github/workflows/publish.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 569bf3d..cd7add7 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -3,9 +3,10 @@ name: Publish to JSR on: - push: - branches: - - main + workflow_run: + workflows: ["Bun CI", "Deno CI", "Node.js CI"] + types: + - completed jobs: publish: From 7d70280771fc63a58d26ff171f5aba0c92ee12e9 Mon Sep 17 00:00:00 2001 From: Pinta365 Date: Wed, 20 Mar 2024 20:16:13 +0100 Subject: [PATCH 2/5] workflow adjustments --- .github/workflows/bun.yml | 2 ++ .github/workflows/deno.yml | 2 ++ .github/workflows/node.yml | 3 ++- .github/workflows/publish.yml | 2 +- 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/bun.yml b/.github/workflows/bun.yml index 51ff52b..2f1c15d 100644 --- a/.github/workflows/bun.yml +++ b/.github/workflows/bun.yml @@ -1,9 +1,11 @@ +# .github/workflows/bun.yml name: Bun CI on: [push, pull_request] jobs: test: + name: Bun Test runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/deno.yml b/.github/workflows/deno.yml index 0a42617..80a597d 100644 --- a/.github/workflows/deno.yml +++ b/.github/workflows/deno.yml @@ -1,9 +1,11 @@ +# .github/workflows/deno.yml name: Deno CI on: [push, pull_request] jobs: test: + name: Deno Test runs-on: ubuntu-latest steps: diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index df49903..54369df 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -1,10 +1,11 @@ +# .github/workflows/node.yml name: Node.js CI on: [push, pull_request] jobs: build: - + name: Node Test runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index cd7add7..2999fe5 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,7 +11,7 @@ on: jobs: publish: runs-on: ubuntu-latest - + needs: [Bun Test, Deno Test, Node Test] permissions: contents: read id-token: write From ecc3fd35c031168026fd8cf2c20cae62e88b9bd8 Mon Sep 17 00:00:00 2001 From: Pinta365 Date: Wed, 20 Mar 2024 20:22:35 +0100 Subject: [PATCH 3/5] remove dependency from publish --- .github/workflows/bun.yml | 1 - .github/workflows/deno.yml | 1 - .github/workflows/node.yml | 1 - .github/workflows/publish.yml | 1 - 4 files changed, 4 deletions(-) diff --git a/.github/workflows/bun.yml b/.github/workflows/bun.yml index 2f1c15d..8e0ae13 100644 --- a/.github/workflows/bun.yml +++ b/.github/workflows/bun.yml @@ -5,7 +5,6 @@ on: [push, pull_request] jobs: test: - name: Bun Test runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/deno.yml b/.github/workflows/deno.yml index 80a597d..145ca9f 100644 --- a/.github/workflows/deno.yml +++ b/.github/workflows/deno.yml @@ -5,7 +5,6 @@ on: [push, pull_request] jobs: test: - name: Deno Test runs-on: ubuntu-latest steps: diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index 54369df..0f2ae27 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -5,7 +5,6 @@ on: [push, pull_request] jobs: build: - name: Node Test runs-on: ubuntu-latest strategy: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 2999fe5..3b04265 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,7 +11,6 @@ on: jobs: publish: runs-on: ubuntu-latest - needs: [Bun Test, Deno Test, Node Test] permissions: contents: read id-token: write From a00307287429e8c3e11ec7b106014519d35cc3b4 Mon Sep 17 00:00:00 2001 From: Pinta365 Date: Wed, 20 Mar 2024 21:35:56 +0100 Subject: [PATCH 4/5] using reusable workflows --- .github/workflows/bun.yml | 15 --------------- .github/workflows/deno.yml | 29 ----------------------------- .github/workflows/node.yml | 18 ------------------ .github/workflows/publish.yml | 3 +-- .github/workflows/test.yml | 23 +++++++++++++++++++++++ 5 files changed, 24 insertions(+), 64 deletions(-) delete mode 100644 .github/workflows/bun.yml delete mode 100644 .github/workflows/deno.yml delete mode 100644 .github/workflows/node.yml create mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/bun.yml b/.github/workflows/bun.yml deleted file mode 100644 index 8e0ae13..0000000 --- a/.github/workflows/bun.yml +++ /dev/null @@ -1,15 +0,0 @@ -# .github/workflows/bun.yml -name: Bun CI - -on: [push, pull_request] - -jobs: - test: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: antongolub/action-setup-bun@v1.13.1 - with: - bun-version: v1.x # Uses latest bun 1 - - run: bun x jsr add @cross/test @std/assert @cross/runtime @cross/deepmerge # Installs dependencies - - run: bun test # Runs the tests \ No newline at end of file diff --git a/.github/workflows/deno.yml b/.github/workflows/deno.yml deleted file mode 100644 index 145ca9f..0000000 --- a/.github/workflows/deno.yml +++ /dev/null @@ -1,29 +0,0 @@ -# .github/workflows/deno.yml -name: Deno CI - -on: [push, pull_request] - -jobs: - test: - runs-on: ubuntu-latest - - steps: - - name: Setup repo - uses: actions/checkout@v4 - - - name: Setup Deno - uses: denoland/setup-deno@v1 - with: - deno-version: v1.x - - - name: Verify formatting - run: deno fmt --check - - - name: Run linter - run: deno lint - - - name: Check types - run: deno check mod.ts - - - name: Run tests - run: deno test --allow-env --allow-read \ No newline at end of file diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml deleted file mode 100644 index 0f2ae27..0000000 --- a/.github/workflows/node.yml +++ /dev/null @@ -1,18 +0,0 @@ -# .github/workflows/node.yml -name: Node.js CI - -on: [push, pull_request] - -jobs: - build: - runs-on: ubuntu-latest - - strategy: - matrix: - node-version: [18.x, 21.x] - - steps: - - uses: actions/checkout@v4 - - run: npx jsr add @cross/test @std/assert @cross/deepmerge @cross/runtime - - run: "echo '{ \"type\": \"module\" }' > package.json" # Needed for tsx to work - - run: npx --yes tsx --test tests/*.test.ts \ No newline at end of file diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 3b04265..37c1ccc 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,10 +1,9 @@ # .github/workflows/publish.yml - name: Publish to JSR on: workflow_run: - workflows: ["Bun CI", "Deno CI", "Node.js CI"] + workflows: ["CI Tests"] types: - completed diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..c36f797 --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,23 @@ +# .github/workflows/test.yml +name: CI Tests + +on: + push: + branches: [main] + pull_request: + branches: [main] + workflow_dispatch: + +jobs: + deno_ci: + uses: cross-org/workflows/.github/workflows/deno-ci.yml@main + with: + entrypoint: mod.ts + bun_ci: + uses: cross-org/workflows/.github/workflows/bun-ci.yml@main + with: + jsr_dependencies: "@cross/test @std/assert" + node_ci: + uses: cross-org/workflows/.github/workflows/node-ci.yml@main + with: + jsr_dependencies: "@cross/test @std/assert" \ No newline at end of file From c4ed13a23b8ac7d4d763119d82fc991f56e2ffce Mon Sep 17 00:00:00 2001 From: Pinta365 Date: Wed, 20 Mar 2024 21:49:56 +0100 Subject: [PATCH 5/5] job changes --- .github/workflows/test.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c36f797..5cfb733 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,8 +16,9 @@ jobs: bun_ci: uses: cross-org/workflows/.github/workflows/bun-ci.yml@main with: - jsr_dependencies: "@cross/test @std/assert" + jsr_dependencies: "@cross/deepmerge @cross/runtime @cross/test @std/assert" node_ci: uses: cross-org/workflows/.github/workflows/node-ci.yml@main with: - jsr_dependencies: "@cross/test @std/assert" \ No newline at end of file + jsr_dependencies: "@cross/deepmerge @cross/runtime @cross/test @std/assert" + test_target: "tests/*.test.ts" \ No newline at end of file