From ab56d914ce0051f26a211a2ae84ca82cf7ae35c3 Mon Sep 17 00:00:00 2001 From: Phred Date: Sat, 11 Sep 2021 05:37:18 -0500 Subject: [PATCH 01/47] try out github actions over travis --- .github/workflows/ci.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 00000000000..d634e522bbc --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,26 @@ +name: CI + +on: + push: + branches: + - github-actions + pull_request: + branches: + - master + +jobs: + test: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - uses: actions/setup-java@v2 + with: + java-version: 8 + cache: maven + + # https://docs.travis-ci.com/user/languages/java/#maven-dependency-management + - run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V + + # https://docs.travis-ci.com/user/languages/java/#maven-default-script-command + - run: mvn test -B From d5a7471f9ce8f41b27fa581bb818b79127ce38e5 Mon Sep 17 00:00:00 2001 From: Phred Date: Sat, 11 Sep 2021 05:44:06 -0500 Subject: [PATCH 02/47] added distribution --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d634e522bbc..7dcf08ccac1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,6 +17,8 @@ jobs: - uses: actions/setup-java@v2 with: java-version: 8 + # https://github.com/actions/setup-java#supported-distributions + distribution: temurin cache: maven # https://docs.travis-ci.com/user/languages/java/#maven-dependency-management From 5359424188533fd29eccd316a8811df5fa4621e3 Mon Sep 17 00:00:00 2001 From: Phred Date: Sat, 11 Sep 2021 05:55:46 -0500 Subject: [PATCH 03/47] added MAVEN_OPTS --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7dcf08ccac1..2bfa8985fae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,6 +8,9 @@ on: branches: - master +env: + MAVEN_OPTS: -Xmx2g + jobs: test: runs-on: ubuntu-latest From ed5122c44095d84d5fe98790554c291786aec592 Mon Sep 17 00:00:00 2001 From: Phred Date: Sat, 11 Sep 2021 06:03:12 -0500 Subject: [PATCH 04/47] try a different distribution :shrug: --- .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 2bfa8985fae..87200d1063c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: with: java-version: 8 # https://github.com/actions/setup-java#supported-distributions - distribution: temurin + distribution: zulu cache: maven # https://docs.travis-ci.com/user/languages/java/#maven-dependency-management From ad53113eb09a78a5bddcae0f3d2f52ddfcb2168b Mon Sep 17 00:00:00 2001 From: Phred Date: Sat, 11 Sep 2021 06:19:00 -0500 Subject: [PATCH 05/47] try a newer version of java --- .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 87200d1063c..fbb127bb1b5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,7 @@ jobs: - uses: actions/setup-java@v2 with: - java-version: 8 + java-version: 11 # https://github.com/actions/setup-java#supported-distributions distribution: zulu cache: maven From ecdea6dd8c0d7e837cb0861c5e5e784c7a2ef18a Mon Sep 17 00:00:00 2001 From: Phred Date: Sat, 11 Sep 2021 07:30:12 -0500 Subject: [PATCH 06/47] try jre over jdk --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fbb127bb1b5..403e0cb38d6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,13 +19,14 @@ jobs: - uses: actions/setup-java@v2 with: - java-version: 11 + java-version: 8 + java-package: jre # https://github.com/actions/setup-java#supported-distributions distribution: zulu cache: maven # https://docs.travis-ci.com/user/languages/java/#maven-dependency-management - - run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V + - run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -T 1C # https://docs.travis-ci.com/user/languages/java/#maven-default-script-command - run: mvn test -B From ea50628c511cafdfb5fedb1c88e57b1c120b71b4 Mon Sep 17 00:00:00 2001 From: Phred Date: Sat, 11 Sep 2021 07:34:47 -0500 Subject: [PATCH 07/47] jre+fx? --- .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 403e0cb38d6..70e1fa8884f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-java@v2 with: java-version: 8 - java-package: jre + java-package: jre+fx # https://github.com/actions/setup-java#supported-distributions distribution: zulu cache: maven From e0d2aa738ffd2b2fe617e881facf0f5fe002f3a4 Mon Sep 17 00:00:00 2001 From: Phred Date: Sat, 11 Sep 2021 07:38:44 -0500 Subject: [PATCH 08/47] jdk+fx --- .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 70e1fa8884f..a8ec0793bae 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -20,7 +20,7 @@ jobs: - uses: actions/setup-java@v2 with: java-version: 8 - java-package: jre+fx + java-package: jdk+fx # https://github.com/actions/setup-java#supported-distributions distribution: zulu cache: maven From 17a9d74046cb6174f71358c297d89a68236a2eab Mon Sep 17 00:00:00 2001 From: Phred Date: Sat, 11 Sep 2021 07:52:48 -0500 Subject: [PATCH 09/47] does this speed up the test run? --- .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 a8ec0793bae..60d9d15ebcf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,4 +29,4 @@ jobs: - run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -T 1C # https://docs.travis-ci.com/user/languages/java/#maven-default-script-command - - run: mvn test -B + - run: mvn test -B -T 1C From 7fbb2ceddd2623916508e6e09befe1eeab4358f3 Mon Sep 17 00:00:00 2001 From: Phred Date: Sat, 11 Sep 2021 09:42:04 -0500 Subject: [PATCH 10/47] no parallel tests --- .github/workflows/ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 60d9d15ebcf..41636758e12 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,4 +29,6 @@ jobs: - run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -T 1C # https://docs.travis-ci.com/user/languages/java/#maven-default-script-command - - run: mvn test -B -T 1C + # tests are interdependent and require a specific order + # running in parallel causes some tests to fail + - run: mvn test -B # -T 1C From 0bc83dda172eafa296d43e6cf2ea90da816ffa2a Mon Sep 17 00:00:00 2001 From: Phred Date: Sat, 11 Sep 2021 10:09:59 -0500 Subject: [PATCH 11/47] increase maven_opts to 3 gigs? :shrug: --- .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 41636758e12..38b810a9854 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ on: - master env: - MAVEN_OPTS: -Xmx2g + MAVEN_OPTS: -Xmx3g jobs: test: From 591d772654787c0d4c5d25eab8fa4827419be588 Mon Sep 17 00:00:00 2001 From: Phred Date: Fri, 1 Oct 2021 06:35:58 -0500 Subject: [PATCH 12/47] removed parallelism from install --- .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 38b810a9854..0d72cae8099 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: cache: maven # https://docs.travis-ci.com/user/languages/java/#maven-dependency-management - - run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V -T 1C + - run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V # -T 1C # https://docs.travis-ci.com/user/languages/java/#maven-default-script-command # tests are interdependent and require a specific order From 7f2f6964f97153e251f38fbe82a2d9ebe700afaf Mon Sep 17 00:00:00 2001 From: Phred Date: Sat, 2 Oct 2021 22:21:16 -0500 Subject: [PATCH 13/47] try reporting to coveralls --- .github/workflows/ci.yml | 16 +++++++++++++++- pom.xml | 8 ++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0d72cae8099..1438c5d94c0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,4 +31,18 @@ jobs: # https://docs.travis-ci.com/user/languages/java/#maven-default-script-command # tests are interdependent and require a specific order # running in parallel causes some tests to fail - - run: mvn test -B # -T 1C + # - run: mvn test -B # -T 1C + + - env: + CI_NAME: github + run: > + mvn + clean + jacoco:prepare-agent + test + jacoco:report + jacoco:report-aggregate + coveralls:report + --no-transfer-progress + --define repoToken=${{ secrets.GITHUB_TOKEN }} + --define pullRequest=${{ github.event.number }} diff --git a/pom.xml b/pom.xml index ffa1aff2100..8109ff51814 100644 --- a/pom.xml +++ b/pom.xml @@ -83,6 +83,14 @@ + + + + + org.eluder.coveralls + coveralls-maven-plugin + 4.3.0 + From ae109017967f9f615d6994b1954d9b2c185187a9 Mon Sep 17 00:00:00 2001 From: Phred Date: Sat, 2 Oct 2021 22:38:37 -0500 Subject: [PATCH 14/47] added jacoco.skip=false --- .github/workflows/ci.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1438c5d94c0..6e0bf2c06e2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,14 @@ jobs: cache: maven # https://docs.travis-ci.com/user/languages/java/#maven-dependency-management - - run: mvn install -DskipTests=true -Dmaven.javadoc.skip=true -B -V # -T 1C + - run: > + mvn + install + --define jacoco.skip=false + --define maven.javadoc.skip=true + --define skipTests=true + --batch-mode + --show-version # https://docs.travis-ci.com/user/languages/java/#maven-default-script-command # tests are interdependent and require a specific order From bf5423cb6dd2a33331bf59a0c389efb338e90a41 Mon Sep 17 00:00:00 2001 From: Phred Date: Sun, 3 Oct 2021 07:46:59 -0500 Subject: [PATCH 15/47] removed mvn clean --- .github/workflows/ci.yml | 2 +- pom.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6e0bf2c06e2..7e8aaeb6f0d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,7 @@ jobs: CI_NAME: github run: > mvn - clean + --define jacoco.skip=false jacoco:prepare-agent test jacoco:report diff --git a/pom.xml b/pom.xml index 8109ff51814..eb10e6c078d 100644 --- a/pom.xml +++ b/pom.xml @@ -120,6 +120,7 @@ Mage.Server.Console Mage.Tests Mage.Verify + report From b12e08453d13cd057cb5a1fa61b7d8602a87a08a Mon Sep 17 00:00:00 2001 From: Phred Date: Sun, 3 Oct 2021 07:49:27 -0500 Subject: [PATCH 16/47] removed debug --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index eb10e6c078d..8109ff51814 100644 --- a/pom.xml +++ b/pom.xml @@ -120,7 +120,6 @@ Mage.Server.Console Mage.Tests Mage.Verify - report From f05ba1e265bb62c32fd487eb12c7e0ab35cd31e8 Mon Sep 17 00:00:00 2001 From: Phred Date: Sun, 3 Oct 2021 12:17:44 -0500 Subject: [PATCH 17/47] removed duplicate define --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7e8aaeb6f0d..a129c5b7ab6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -44,7 +44,6 @@ jobs: CI_NAME: github run: > mvn - --define jacoco.skip=false jacoco:prepare-agent test jacoco:report From 0454fbead8358aacff754a63bc2a3f66a4b1ecdf Mon Sep 17 00:00:00 2001 From: Phred Date: Sun, 3 Oct 2021 12:34:37 -0500 Subject: [PATCH 18/47] added verify phase --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a129c5b7ab6..1c54830b7e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -48,6 +48,7 @@ jobs: test jacoco:report jacoco:report-aggregate + verify coveralls:report --no-transfer-progress --define repoToken=${{ secrets.GITHUB_TOKEN }} From 44c4a0a40f9c3efa8359d02743d07b0a0dbbcaf5 Mon Sep 17 00:00:00 2001 From: Phred Date: Sun, 3 Oct 2021 14:54:17 -0500 Subject: [PATCH 19/47] disabled actions/setup-java cache --- .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 1c54830b7e6..ba794f38eb0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: java-package: jdk+fx # https://github.com/actions/setup-java#supported-distributions distribution: zulu - cache: maven + # cache: maven # https://docs.travis-ci.com/user/languages/java/#maven-dependency-management - run: > From d6699f62f04fe000751048abf50c39f6a6d5a2bb Mon Sep 17 00:00:00 2001 From: Phred Date: Sun, 3 Oct 2021 15:19:56 -0500 Subject: [PATCH 20/47] disable jacoco.skip for testing step --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ba794f38eb0..88f42d27222 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -51,5 +51,6 @@ jobs: verify coveralls:report --no-transfer-progress + --define jacoco.skip=false --define repoToken=${{ secrets.GITHUB_TOKEN }} --define pullRequest=${{ github.event.number }} From 547784605924bcc5c819f12a2ef91065d714445d Mon Sep 17 00:00:00 2001 From: Phred Date: Sun, 3 Oct 2021 22:36:26 -0500 Subject: [PATCH 21/47] copying the Travis CI setup --- .github/workflows/ci.yml | 6 ++---- .travis.yml | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 88f42d27222..f492accb77b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,6 +29,7 @@ jobs: - run: > mvn install + jacoco:prepare-agent --define jacoco.skip=false --define maven.javadoc.skip=true --define skipTests=true @@ -38,19 +39,16 @@ jobs: # https://docs.travis-ci.com/user/languages/java/#maven-default-script-command # tests are interdependent and require a specific order # running in parallel causes some tests to fail - # - run: mvn test -B # -T 1C + - run: mvn test -B # -T 1C - env: CI_NAME: github run: > mvn - jacoco:prepare-agent - test jacoco:report jacoco:report-aggregate verify coveralls:report - --no-transfer-progress --define jacoco.skip=false --define repoToken=${{ secrets.GITHUB_TOKEN }} --define pullRequest=${{ github.event.number }} diff --git a/.travis.yml b/.travis.yml index 28ddf0984a4..b4d9040161f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,24 @@ # faster builds git: depth: 3 + quiet: true submodules: false sudo: false dist: trusty language: java before_install: - - echo "MAVEN_OPTS='-Xmx2g'" > ~/.mavenrc \ No newline at end of file + - echo "MAVEN_OPTS='-Xmx2g'" > ~/.mavenrc +cache: + directories: + - $HOME/.m2 +install: > + mvn + install + jacoco:prepare-agent + --define jacoco.skip=false + --define maven.javadoc.skip=true + --define skipTests=true + --batch-mode + --show-version +after_success: + - mvn jacoco:report jacoco:report-aggregate verify coveralls:report --define jacoco.skip=false From c778d7d7e9e6a51f082e7d93d88c60ce9dc22e80 Mon Sep 17 00:00:00 2001 From: Phred Date: Mon, 4 Oct 2021 09:16:41 -0500 Subject: [PATCH 22/47] removed travis changes from this branch --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b4d9040161f..e7aa1ba1ee7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,6 @@ # faster builds git: depth: 3 - quiet: true submodules: false sudo: false dist: trusty From fe5f70b7aa44bb96daef381ecdf5706c0239eca5 Mon Sep 17 00:00:00 2001 From: Phred Date: Tue, 5 Oct 2021 08:49:04 -0500 Subject: [PATCH 23/47] env over cli params --- .github/workflows/ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f492accb77b..62310c480e1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,9 @@ jobs: - run: mvn test -B # -T 1C - env: - CI_NAME: github + CI_BRANCH: ${{ env.GITHUB_REF }} + CI_NAME: github-actions + CI_PULL_REQUEST: ${{ github.event.number }} run: > mvn jacoco:report @@ -51,4 +53,3 @@ jobs: coveralls:report --define jacoco.skip=false --define repoToken=${{ secrets.GITHUB_TOKEN }} - --define pullRequest=${{ github.event.number }} From 6d2b0201b29abba642f29fcde3d98fad0a52c969 Mon Sep 17 00:00:00 2001 From: Phred Date: Tue, 5 Oct 2021 10:09:54 -0500 Subject: [PATCH 24/47] tweaking env --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 62310c480e1..30e5df3d339 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,9 +42,9 @@ jobs: - run: mvn test -B # -T 1C - env: - CI_BRANCH: ${{ env.GITHUB_REF }} + CI_BRANCH: ${{ github.ref }} CI_NAME: github-actions - CI_PULL_REQUEST: ${{ github.event.number }} + # CI_PULL_REQUEST: ${{ github.event.number }} run: > mvn jacoco:report From 1f8eac78f350993fcc3d328015fe4d65b79a2ee0 Mon Sep 17 00:00:00 2001 From: Phred Date: Wed, 6 Oct 2021 03:52:46 -0500 Subject: [PATCH 25/47] re-enable the cache to work around network issues? --- .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 30e5df3d339..d3bd09ff89f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: java-package: jdk+fx # https://github.com/actions/setup-java#supported-distributions distribution: zulu - # cache: maven + cache: maven # https://docs.travis-ci.com/user/languages/java/#maven-dependency-management - run: > From da4ef53a543817d78a45d7fa6fe32e419fe3d517 Mon Sep 17 00:00:00 2001 From: Phred Date: Wed, 6 Oct 2021 06:30:37 -0500 Subject: [PATCH 26/47] added maven timeout options --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d3bd09ff89f..bb19178784b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,8 @@ on: - master env: - MAVEN_OPTS: -Xmx3g + MAVEN_OPTS: -Xmx3g -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 + jobs: test: From b6dfb0d922fbee9d4b46a08ec0c62b6abd882fbd Mon Sep 17 00:00:00 2001 From: Phred Date: Wed, 6 Oct 2021 07:04:39 -0500 Subject: [PATCH 27/47] pass pr on command line --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bb19178784b..4da77fe43e8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,7 +43,7 @@ jobs: - run: mvn test -B # -T 1C - env: - CI_BRANCH: ${{ github.ref }} + # CI_BRANCH: ${{ github.ref }} CI_NAME: github-actions # CI_PULL_REQUEST: ${{ github.event.number }} run: > @@ -54,3 +54,4 @@ jobs: coveralls:report --define jacoco.skip=false --define repoToken=${{ secrets.GITHUB_TOKEN }} + --define pullRequest=${{ github.event.number }} From 860e5274f577cd7fe8d59095df10026731bc1535 Mon Sep 17 00:00:00 2001 From: Phred Date: Wed, 6 Oct 2021 11:55:55 -0500 Subject: [PATCH 28/47] another day, another try --- .github/workflows/ci.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4da77fe43e8..7eb3083e885 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,9 +43,16 @@ jobs: - run: mvn test -B # -T 1C - env: - # CI_BRANCH: ${{ github.ref }} - CI_NAME: github-actions - # CI_PULL_REQUEST: ${{ github.event.number }} + BRANCH: ${{ github.ref }} + id: setup + run: | + echo "::set-output name=branch-name::${BRANCH#refs/heades/}" + echo "::set-output name=pr-number::$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")" + - env: + CI_BUILD_URL: https://github.com/${{ github.repository }}/comit/${{ github.sha }}/checks + CI_BRANCH: ${{ steps.setup.output.branch-name }} + CI_NAME: github + CI_PULL_REQUEST: ${{ steps.setup.output.pr-number }} run: > mvn jacoco:report @@ -54,4 +61,3 @@ jobs: coveralls:report --define jacoco.skip=false --define repoToken=${{ secrets.GITHUB_TOKEN }} - --define pullRequest=${{ github.event.number }} From 4a6b808c6821ac7c50bf39ef384d49c69e1f80b5 Mon Sep 17 00:00:00 2001 From: Phred Date: Wed, 6 Oct 2021 12:52:30 -0500 Subject: [PATCH 29/47] added build number --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7eb3083e885..1c60af4489f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,6 +49,7 @@ jobs: echo "::set-output name=branch-name::${BRANCH#refs/heades/}" echo "::set-output name=pr-number::$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")" - env: + CI_BUILD_NUMBER: ${{ github.run_id }} CI_BUILD_URL: https://github.com/${{ github.repository }}/comit/${{ github.sha }}/checks CI_BRANCH: ${{ steps.setup.output.branch-name }} CI_NAME: github From fd9db88f48910631c7c0021a4b180a0ca2156131 Mon Sep 17 00:00:00 2001 From: Phred Date: Wed, 6 Oct 2021 12:59:27 -0500 Subject: [PATCH 30/47] fixed variable values --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1c60af4489f..45bd6aec426 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,18 +42,18 @@ jobs: # running in parallel causes some tests to fail - run: mvn test -B # -T 1C - - env: - BRANCH: ${{ github.ref }} + - name: Parse branch name + env: + BRANCH: ${{ github.head_ref || github.ref }} id: setup run: | - echo "::set-output name=branch-name::${BRANCH#refs/heades/}" - echo "::set-output name=pr-number::$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")" + echo "::set-output name=branch-name::${BRANCH#refs/heads/}" - env: CI_BUILD_NUMBER: ${{ github.run_id }} CI_BUILD_URL: https://github.com/${{ github.repository }}/comit/${{ github.sha }}/checks CI_BRANCH: ${{ steps.setup.output.branch-name }} CI_NAME: github - CI_PULL_REQUEST: ${{ steps.setup.output.pr-number }} + CI_PULL_REQUEST: ${{ github.event.pull_request.number }} run: > mvn jacoco:report From 4370b9da6954e5106f6302249d44e9fdabbfde98 Mon Sep 17 00:00:00 2001 From: Phred Date: Wed, 6 Oct 2021 13:46:00 -0500 Subject: [PATCH 31/47] tweaking values --- .github/workflows/ci.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 45bd6aec426..8fd49f0675b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,16 +42,11 @@ jobs: # running in parallel causes some tests to fail - run: mvn test -B # -T 1C - - name: Parse branch name - env: - BRANCH: ${{ github.head_ref || github.ref }} - id: setup - run: | - echo "::set-output name=branch-name::${BRANCH#refs/heads/}" - env: CI_BUILD_NUMBER: ${{ github.run_id }} - CI_BUILD_URL: https://github.com/${{ github.repository }}/comit/${{ github.sha }}/checks - CI_BRANCH: ${{ steps.setup.output.branch-name }} + # this will need to be updated to work on the main branch + CI_BUILD_URL: https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }}/checks + CI_BRANCH: ${{ github.head_ref }} CI_NAME: github CI_PULL_REQUEST: ${{ github.event.pull_request.number }} run: > From 7db8e564ecf0984a450204fa5c5d10f1f4679da4 Mon Sep 17 00:00:00 2001 From: Phred Date: Thu, 7 Oct 2021 08:41:15 -0500 Subject: [PATCH 32/47] use github action instead of java to send report --- .github/workflows/ci.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fd49f0675b..1083cb6d399 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,18 +42,14 @@ jobs: # running in parallel causes some tests to fail - run: mvn test -B # -T 1C - - env: - CI_BUILD_NUMBER: ${{ github.run_id }} - # this will need to be updated to work on the main branch - CI_BUILD_URL: https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }}/checks - CI_BRANCH: ${{ github.head_ref }} - CI_NAME: github - CI_PULL_REQUEST: ${{ github.event.pull_request.number }} - run: > + - run: > mvn jacoco:report jacoco:report-aggregate verify - coveralls:report --define jacoco.skip=false - --define repoToken=${{ secrets.GITHUB_TOKEN }} + + - name: Coveralls GitHub Action + uses: coverallsapp/github-action@1.1.3 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} From bfe9c43d83b8648dd200f68fafe108582bc38061 Mon Sep 17 00:00:00 2001 From: Phred Date: Thu, 7 Oct 2021 09:16:41 -0500 Subject: [PATCH 33/47] jacoco doesn't support LCOV :cry: --- .github/workflows/ci.yml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1083cb6d399..8fd49f0675b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,14 +42,18 @@ jobs: # running in parallel causes some tests to fail - run: mvn test -B # -T 1C - - run: > + - env: + CI_BUILD_NUMBER: ${{ github.run_id }} + # this will need to be updated to work on the main branch + CI_BUILD_URL: https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }}/checks + CI_BRANCH: ${{ github.head_ref }} + CI_NAME: github + CI_PULL_REQUEST: ${{ github.event.pull_request.number }} + run: > mvn jacoco:report jacoco:report-aggregate verify + coveralls:report --define jacoco.skip=false - - - name: Coveralls GitHub Action - uses: coverallsapp/github-action@1.1.3 - with: - github-token: ${{ secrets.GITHUB_TOKEN }} + --define repoToken=${{ secrets.GITHUB_TOKEN }} From f4ad6e889d256744edd18656271d7772a82fab24 Mon Sep 17 00:00:00 2001 From: Phred Date: Thu, 7 Oct 2021 16:35:34 -0500 Subject: [PATCH 34/47] separated coveralls:report into its own step --- .github/workflows/ci.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8fd49f0675b..1e10d13d744 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,6 +42,14 @@ jobs: # running in parallel causes some tests to fail - run: mvn test -B # -T 1C + # do we need all these goals? Most other projects just do jacoco:report and coveralls:report + - run: > + mvn + jacoco:report + jacoco:report-aggregate + verify + --define jacoco.skip=false + - env: CI_BUILD_NUMBER: ${{ github.run_id }} # this will need to be updated to work on the main branch @@ -51,9 +59,5 @@ jobs: CI_PULL_REQUEST: ${{ github.event.pull_request.number }} run: > mvn - jacoco:report - jacoco:report-aggregate - verify coveralls:report - --define jacoco.skip=false --define repoToken=${{ secrets.GITHUB_TOKEN }} From 0308380b3e02f8c5aee0dcb1cee7624384632601 Mon Sep 17 00:00:00 2001 From: Phred Date: Thu, 7 Oct 2021 18:16:36 -0500 Subject: [PATCH 35/47] I don't understand the interdependencies of each goal :shrug: --- .github/workflows/ci.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1e10d13d744..f5aaf4fea03 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,15 +40,7 @@ jobs: # https://docs.travis-ci.com/user/languages/java/#maven-default-script-command # tests are interdependent and require a specific order # running in parallel causes some tests to fail - - run: mvn test -B # -T 1C - - # do we need all these goals? Most other projects just do jacoco:report and coveralls:report - - run: > - mvn - jacoco:report - jacoco:report-aggregate - verify - --define jacoco.skip=false + - run: mvn test --batch-mode - env: CI_BUILD_NUMBER: ${{ github.run_id }} @@ -57,7 +49,12 @@ jobs: CI_BRANCH: ${{ github.head_ref }} CI_NAME: github CI_PULL_REQUEST: ${{ github.event.pull_request.number }} + # do we need all these goals? Most other projects just do jacoco:report and coveralls:report run: > mvn + jacoco:report + jacoco:report-aggregate + verify coveralls:report + --define jacoco.skip=false --define repoToken=${{ secrets.GITHUB_TOKEN }} From 236deec96530d48cf35651e6d42aa78f46453cf9 Mon Sep 17 00:00:00 2001 From: Phred Date: Fri, 8 Oct 2021 06:06:01 -0500 Subject: [PATCH 36/47] try passing jacocoReports config --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index b89837856ed..3c09ca3f9f2 100644 --- a/pom.xml +++ b/pom.xml @@ -89,6 +89,10 @@ org.eluder.coveralls coveralls-maven-plugin 4.3.0 + + + ${project.basedir}/../Mage.Verify/target/site/jacoco-aggregate/jacoco.xml + From 2bfdc26e68a3c5c25c78d2fe780a9671e1b80749 Mon Sep 17 00:00:00 2001 From: Phred Date: Fri, 8 Oct 2021 06:07:55 -0500 Subject: [PATCH 37/47] fixed nesting? :shrug: --- pom.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c09ca3f9f2..fd23b52482b 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,9 @@ 4.3.0 - ${project.basedir}/../Mage.Verify/target/site/jacoco-aggregate/jacoco.xml + + ${project.basedir}/../Mage.Verify/target/site/jacoco-aggregate/jacoco.xml + From 92976c9392b54b04f3d25c7ae67c1e678f7ac62f Mon Sep 17 00:00:00 2001 From: Phred Lane Date: Fri, 16 Feb 2024 01:57:05 -0600 Subject: [PATCH 38/47] Update actions to see how this fails now --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f5aaf4fea03..f1e2071cbab 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,9 +16,9 @@ jobs: test: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v4 with: java-version: 8 java-package: jdk+fx From 704026ae5805cab99fc0c333d10133fc40ec01fb Mon Sep 17 00:00:00 2001 From: Phred Lane Date: Fri, 16 Feb 2024 03:03:34 -0600 Subject: [PATCH 39/47] Update report location? :shrug: --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index efdf6dc9c38..4535a92b870 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ - ${project.basedir}/../Mage.Verify/target/site/jacoco-aggregate/jacoco.xml + ${root.dir}/Mage.Reports/target/site/jacoco-aggregate/jacoco.xml From 4bbb65ff2635e261aa661c2365575939b83d7c13 Mon Sep 17 00:00:00 2001 From: Phred Lane Date: Fri, 16 Feb 2024 04:41:08 -0600 Subject: [PATCH 40/47] cleaning up --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f1e2071cbab..f6a047ca8f4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,8 +9,11 @@ on: - master env: - MAVEN_OPTS: -Xmx3g -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 - + MAVEN_OPTS: >- + -Xmx3g + --define http.keepAlive=false + --define maven.wagon.http.pool=false + --define maven.wagon.httpconnectionManager.ttlSeconds=120 jobs: test: @@ -44,7 +47,6 @@ jobs: - env: CI_BUILD_NUMBER: ${{ github.run_id }} - # this will need to be updated to work on the main branch CI_BUILD_URL: https://github.com/${{ github.repository }}/pull/${{ github.event.pull_request.number }}/checks CI_BRANCH: ${{ github.head_ref }} CI_NAME: github From 7c1f90f6c9a4ff0ab0b6f6c53362d0f83c71fad7 Mon Sep 17 00:00:00 2001 From: Phred Lane Date: Fri, 16 Feb 2024 04:44:03 -0600 Subject: [PATCH 41/47] reverted maven options :shrug: --- .github/workflows/ci.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f6a047ca8f4..533282efc04 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,11 +9,7 @@ on: - master env: - MAVEN_OPTS: >- - -Xmx3g - --define http.keepAlive=false - --define maven.wagon.http.pool=false - --define maven.wagon.httpconnectionManager.ttlSeconds=120 + MAVEN_OPTS: -Xmx3g -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 jobs: test: From 27dca19bc1c3c9bf5bdcfb9281ebc99a2decf34c Mon Sep 17 00:00:00 2001 From: Phred Lane Date: Fri, 16 Feb 2024 05:05:43 -0600 Subject: [PATCH 42/47] limit test runs to changes in java and xml files --- .github/workflows/ci.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 533282efc04..edadba13131 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -2,11 +2,15 @@ name: CI on: push: - branches: - - github-actions + paths: + - '**.java' + - '**.xml' pull_request: branches: - master + paths: + - '**.java' + - '**.xml' env: MAVEN_OPTS: -Xmx3g -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 From 6b6d0d9c2ff04a214406b5a9751cbbf56c031e98 Mon Sep 17 00:00:00 2001 From: Phred Lane Date: Fri, 16 Feb 2024 05:32:17 -0600 Subject: [PATCH 43/47] exclude generated sources from coverage report --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 4535a92b870..eae4d9421b1 100644 --- a/pom.xml +++ b/pom.xml @@ -108,6 +108,10 @@ ${root.dir}/Mage.Reports/target/site/jacoco-aggregate/jacoco.xml + + + **/generated-sources/* + From b6785b10c58296d65213bae33de2dfde7006aa16 Mon Sep 17 00:00:00 2001 From: Phred Lane Date: Fri, 16 Feb 2024 09:09:43 -0600 Subject: [PATCH 44/47] fixed typo --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index eae4d9421b1..39cc307f82c 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ - **/generated-sources/* + **/generated-sources/** From b245eed9b260bd8ab828148f98ed643c6017282d Mon Sep 17 00:00:00 2001 From: Phred Lane Date: Fri, 16 Feb 2024 21:16:42 -0600 Subject: [PATCH 45/47] fixed wildcard ignore path --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 39cc307f82c..39e13ff0320 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ - **/generated-sources/** + **/generated-sources/**/* From 83d53b9197a4ba1bbe0d09a5430cabe476d5b31e Mon Sep 17 00:00:00 2001 From: Phred Lane Date: Sat, 17 Feb 2024 02:54:41 -0600 Subject: [PATCH 46/47] dust myself off and try again --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 39e13ff0320..3dfc9aaee79 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,8 @@ - **/generated-sources/**/* + ${root.dir}/**/generated-sources/**/*.java + ${root.dir}/Mage.Server/src/target/generated-sources/**/*.java From 4448db85b1684afe50d55b22ab1b95cc3f558936 Mon Sep 17 00:00:00 2001 From: Phred Lane Date: Sat, 17 Feb 2024 03:35:54 -0600 Subject: [PATCH 47/47] corrected static ignore path --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3dfc9aaee79..272becf60a3 100644 --- a/pom.xml +++ b/pom.xml @@ -111,7 +111,7 @@ ${root.dir}/**/generated-sources/**/*.java - ${root.dir}/Mage.Server/src/target/generated-sources/**/*.java + ${root.dir}/Mage.Server/target/generated-sources/**/*.java