From 60c8d245f9950e8fd3cb21a99fa746c06880f010 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Mon, 31 Mar 2025 14:48:22 +0200 Subject: [PATCH 1/6] ci: run CI for all changes targetting main branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - "on push" to "main" - "on pull request" targeting "main" This is the same configuration we already have in spark-evaluate. Signed-off-by: Miroslav Bajtoš --- .github/workflows/ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 79b6405..4b7dcd0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,9 @@ name: CI -on: [push] +on: + push: + branches: [main] + pull_request: + branches: [main] env: ZINNIA_VERSION: v0.20.2 From a98aa85702ab22151f617cc401fedb6093bd9f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Mon, 31 Mar 2025 14:54:50 +0200 Subject: [PATCH 2/6] ci: extract linting to a parallel job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miroslav Bajtoš --- .github/workflows/ci.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b7dcd0..54bb110 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,8 +13,6 @@ jobs: steps: - uses: actions/checkout@v4 - run: curl -L https://github.com/filecoin-station/zinnia/releases/download/${{ env.ZINNIA_VERSION }}/zinnia-linux-x64.tar.gz | tar -xz - - uses: actions/setup-node@v4 - - run: npx standard - run: ./zinnia run test.js test-windows: @@ -29,3 +27,10 @@ jobs: extract: true token: ${{ secrets.GITHUB_TOKEN }} - run: ./zinnia.exe run test.js + + lint: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: actions/setup-node@v4 + - run: npx standard From 92b71c2532a3cdaedf94da29fa6ce24f3fa08eb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Mon, 31 Mar 2025 14:55:02 +0200 Subject: [PATCH 3/6] ci: rename "build" to "test-linux" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miroslav Bajtoš --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 54bb110..ba55c1f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: env: ZINNIA_VERSION: v0.20.2 jobs: - build: + test-linux: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From d1517abe589535177b5a195ca57ee63ae438873f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Tue, 1 Apr 2025 09:47:20 +0200 Subject: [PATCH 4/6] Revert "ci: extract linting to a parallel job" This reverts commit a98aa85702ab22151f617cc401fedb6093bd9f86. --- .github/workflows/ci.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba55c1f..63a27d3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,8 @@ jobs: steps: - uses: actions/checkout@v4 - run: curl -L https://github.com/filecoin-station/zinnia/releases/download/${{ env.ZINNIA_VERSION }}/zinnia-linux-x64.tar.gz | tar -xz + - uses: actions/setup-node@v4 + - run: npx standard - run: ./zinnia run test.js test-windows: @@ -27,10 +29,3 @@ jobs: extract: true token: ${{ secrets.GITHUB_TOKEN }} - run: ./zinnia.exe run test.js - - lint: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-node@v4 - - run: npx standard From d73ceb4d06493dc571ee6b7b321d7036e795c14b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Tue, 1 Apr 2025 09:47:36 +0200 Subject: [PATCH 5/6] Revert "ci: rename "build" to "test-linux"" This reverts commit 92b71c2532a3cdaedf94da29fa6ce24f3fa08eb7. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 63a27d3..4b7dcd0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,7 +8,7 @@ on: env: ZINNIA_VERSION: v0.20.2 jobs: - test-linux: + build: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 From 11d5cd287fdb0513506f93b84deacbf685407f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Bajto=C5=A1?= Date: Tue, 1 Apr 2025 09:49:25 +0200 Subject: [PATCH 6/6] ci: run CI for pull requests targeting any branch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miroslav Bajtoš --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b7dcd0..0ca1e88 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -3,7 +3,6 @@ on: push: branches: [main] pull_request: - branches: [main] env: ZINNIA_VERSION: v0.20.2