From ad5610c5befd53a1b129850a18967173ab667887 Mon Sep 17 00:00:00 2001 From: Sander Ploegsma Date: Wed, 31 Jan 2024 09:34:47 +0100 Subject: [PATCH 1/7] Only run applicable GHA workflows on PRs --- .github/workflows/build.yml | 26 ---------------- .github/workflows/java.yml | 54 ++++++++++++++++++++++++++++++++++ .github/workflows/lint.yml | 34 --------------------- .github/workflows/markdown.yml | 22 ++++++++++++++ .github/workflows/test.yml | 23 --------------- 5 files changed, 76 insertions(+), 83 deletions(-) delete mode 100644 .github/workflows/build.yml create mode 100644 .github/workflows/java.yml delete mode 100644 .github/workflows/lint.yml create mode 100644 .github/workflows/markdown.yml delete mode 100644 .github/workflows/test.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml deleted file mode 100644 index ec490711d..000000000 --- a/.github/workflows/build.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Build - -on: - pull_request: - push: - branches: - - main - workflow_dispatch: - -defaults: - run: - working-directory: exercises - -jobs: - build: - name: Check if tests compile cleanly with starter sources - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - - name: Set up JDK 1.17 - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 - with: - java-version: 17 - distribution: "temurin" - - name: Check if tests compile cleanly with starter sources - run: ./gradlew compileStarterTestJava --continue diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml new file mode 100644 index 000000000..615137164 --- /dev/null +++ b/.github/workflows/java.yml @@ -0,0 +1,54 @@ +name: Java + +on: + pull_request: + paths: + - "**/*.java" + - "**/*.gradle" + push: + branches: + - main + workflow_dispatch: + +jobs: + build: + name: Check if tests compile cleanly with starter sources + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + - name: Set up JDK 1.17 + uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 + with: + java-version: 17 + distribution: "temurin" + - name: Check if tests compile cleanly with starter sources + run: ./gradlew compileStarterTestJava --continue + working-directory: exercises + + lint: + name: Lint Java files using Checkstyle + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + - name: Set up JDK 1.17 + uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 + with: + java-version: 17 + distribution: "temurin" + - name: Run checkstyle + run: ./gradlew check --exclude-task test --continue + working-directory: exercises + + test: + name: Test all exercises using java-test-runner + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + - name: Test all exercises using java-test-runner + run: bin/test-with-test-runner + - name: Archive test results + uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 + with: + name: test-results + path: exercises/**/build/results.json + if: failure() diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml deleted file mode 100644 index b2b55492d..000000000 --- a/.github/workflows/lint.yml +++ /dev/null @@ -1,34 +0,0 @@ -name: Lint - -on: - pull_request: - push: - branches: - - main - workflow_dispatch: - -permissions: - contents: read - -jobs: - java: - name: Lint Java files using Checkstyle - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - - name: Set up JDK 1.17 - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 - with: - java-version: 17 - distribution: "temurin" - - name: Run checkstyle - run: ./gradlew check --exclude-task test --continue - working-directory: exercises - - markdown: - name: Lint Markdown files - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - - name: Lint markdown - uses: DavidAnson/markdownlint-cli2-action@510b996878fc0d1a46c8a04ec86b06dbfba09de7 diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml new file mode 100644 index 000000000..c195f7613 --- /dev/null +++ b/.github/workflows/markdown.yml @@ -0,0 +1,22 @@ +name: Markdown + +on: + pull_request: + paths: + - "**/*.md" + push: + branches: + - main + workflow_dispatch: + +permissions: + contents: read + +jobs: + lint: + name: Lint Markdown files + runs-on: ubuntu-22.04 + steps: + - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 + - name: Lint markdown + uses: DavidAnson/markdownlint-cli2-action@510b996878fc0d1a46c8a04ec86b06dbfba09de7 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml deleted file mode 100644 index dc26d9d5d..000000000 --- a/.github/workflows/test.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: Test - -on: - pull_request: - push: - branches: - - main - workflow_dispatch: - -jobs: - test: - name: Test all exercises using java-test-runner - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 - - name: Test all exercises using java-test-runner - run: bin/test-with-test-runner - - name: Archive test results - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 - with: - name: test-results - path: exercises/**/build/results.json - if: failure() From 198180e89fdaf9ab320a24c4503ef5d8e280f200 Mon Sep 17 00:00:00 2001 From: Sander Ploegsma Date: Wed, 31 Jan 2024 09:36:56 +0100 Subject: [PATCH 2/7] Temporarily change .java file to check if workflow runs --- exercises/concept/lasagna/.meta/src/reference/java/Lasagna.java | 1 + 1 file changed, 1 insertion(+) diff --git a/exercises/concept/lasagna/.meta/src/reference/java/Lasagna.java b/exercises/concept/lasagna/.meta/src/reference/java/Lasagna.java index c19aa8362..6c9808f3c 100644 --- a/exercises/concept/lasagna/.meta/src/reference/java/Lasagna.java +++ b/exercises/concept/lasagna/.meta/src/reference/java/Lasagna.java @@ -15,3 +15,4 @@ public int totalTimeInMinutes(int numberOfLayers, int actualMinutesInOven) { return preparationTimeInMinutes(numberOfLayers) + actualMinutesInOven; } } + From 2db18738efb131849520fc6e84190609dd6d8bc5 Mon Sep 17 00:00:00 2001 From: Sander Ploegsma Date: Wed, 31 Jan 2024 09:37:46 +0100 Subject: [PATCH 3/7] Revert "Temporarily change .java file to check if workflow runs" This reverts commit 198180e89fdaf9ab320a24c4503ef5d8e280f200. --- exercises/concept/lasagna/.meta/src/reference/java/Lasagna.java | 1 - 1 file changed, 1 deletion(-) diff --git a/exercises/concept/lasagna/.meta/src/reference/java/Lasagna.java b/exercises/concept/lasagna/.meta/src/reference/java/Lasagna.java index 6c9808f3c..c19aa8362 100644 --- a/exercises/concept/lasagna/.meta/src/reference/java/Lasagna.java +++ b/exercises/concept/lasagna/.meta/src/reference/java/Lasagna.java @@ -15,4 +15,3 @@ public int totalTimeInMinutes(int numberOfLayers, int actualMinutesInOven) { return preparationTimeInMinutes(numberOfLayers) + actualMinutesInOven; } } - From 63032ed0cd3d807d157dc1e8c256a674b19abd04 Mon Sep 17 00:00:00 2001 From: Sander Ploegsma Date: Wed, 31 Jan 2024 09:38:09 +0100 Subject: [PATCH 4/7] Temporarily change .gradle file to check if workflow runs --- exercises/concept/squeaky-clean/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/exercises/concept/squeaky-clean/build.gradle b/exercises/concept/squeaky-clean/build.gradle index 1344305f7..a5f7686be 100644 --- a/exercises/concept/squeaky-clean/build.gradle +++ b/exercises/concept/squeaky-clean/build.gradle @@ -21,3 +21,4 @@ test { events = ["passed", "failed", "skipped"] } } + From 1727b9ed3a6b0f1d9765f3fabd60eef194b9b074 Mon Sep 17 00:00:00 2001 From: Sander Ploegsma Date: Wed, 31 Jan 2024 09:38:27 +0100 Subject: [PATCH 5/7] Revert "Temporarily change .gradle file to check if workflow runs" This reverts commit 63032ed0cd3d807d157dc1e8c256a674b19abd04. --- exercises/concept/squeaky-clean/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/exercises/concept/squeaky-clean/build.gradle b/exercises/concept/squeaky-clean/build.gradle index a5f7686be..1344305f7 100644 --- a/exercises/concept/squeaky-clean/build.gradle +++ b/exercises/concept/squeaky-clean/build.gradle @@ -21,4 +21,3 @@ test { events = ["passed", "failed", "skipped"] } } - From 847519dddfa7f2278872cd167987c0a231e66723 Mon Sep 17 00:00:00 2001 From: Sander Ploegsma Date: Wed, 31 Jan 2024 09:39:18 +0100 Subject: [PATCH 6/7] Temporarily change .md file to check if workflow runs --- exercises/concept/squeaky-clean/.docs/hints.md | 1 + 1 file changed, 1 insertion(+) diff --git a/exercises/concept/squeaky-clean/.docs/hints.md b/exercises/concept/squeaky-clean/.docs/hints.md index 7981ff47e..8369715d1 100644 --- a/exercises/concept/squeaky-clean/.docs/hints.md +++ b/exercises/concept/squeaky-clean/.docs/hints.md @@ -29,3 +29,4 @@ [toupper]: https://docs.oracle.com/en/java/javase/14/docs/api/java.base/java/lang/Character.html#toUpperCase(char) [isletter]: https://docs.oracle.com/en/java/javase/14/docs/api/java.base/java/lang/Character.html#isLetter(char) [isdigit]: https://docs.oracle.com/en/java/javase/14/docs/api/java.base/java/lang/Character.html#isDigit(char) + From b37fb6af356b5707eef14169229ba13025983c09 Mon Sep 17 00:00:00 2001 From: Sander Ploegsma Date: Wed, 31 Jan 2024 09:39:44 +0100 Subject: [PATCH 7/7] Revert "Temporarily change .md file to check if workflow runs" This reverts commit 847519dddfa7f2278872cd167987c0a231e66723. --- exercises/concept/squeaky-clean/.docs/hints.md | 1 - 1 file changed, 1 deletion(-) diff --git a/exercises/concept/squeaky-clean/.docs/hints.md b/exercises/concept/squeaky-clean/.docs/hints.md index 8369715d1..7981ff47e 100644 --- a/exercises/concept/squeaky-clean/.docs/hints.md +++ b/exercises/concept/squeaky-clean/.docs/hints.md @@ -29,4 +29,3 @@ [toupper]: https://docs.oracle.com/en/java/javase/14/docs/api/java.base/java/lang/Character.html#toUpperCase(char) [isletter]: https://docs.oracle.com/en/java/javase/14/docs/api/java.base/java/lang/Character.html#isLetter(char) [isdigit]: https://docs.oracle.com/en/java/javase/14/docs/api/java.base/java/lang/Character.html#isDigit(char) -