From 6472ad91e5240bed427933b943d45d856ff7a96c Mon Sep 17 00:00:00 2001 From: "R. Kaleta" Date: Wed, 30 Apr 2025 13:25:30 +0200 Subject: [PATCH 1/6] Remove CircleCI pipeline --- .circleci/config.yml | 58 -------------------------------------------- 1 file changed, 58 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 7e86245..0000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,58 +0,0 @@ -version: 2.1 - -jobs: - ant-build-and-test: - working_directory: ~/AlgoLib_Java - docker: - - image: cimg/base:stable - auth: - username: mydockerhub-user - password: $DOCKERHUB_PASSWORD - steps: - - checkout - - run: - name: APT Install Java - command: sudo apt-get update && sudo apt-get install openjdk-17-jdk - - run: - name: APT Install Apache ANT - command: sudo apt-get update && sudo apt-get install ant - - run: - name: Install JUnit5 for ANT - command: ./ci/install_ant_junit5.sh - - run: - name: Download Dependencies - command: ant resolve - - run: - name: Build - command: ant jar - - run: - name: Test - command: ant test - - store_test_results: - path: ./antBuild/junit/result - gradle-build-and-test: - working_directory: ~/AlgoLib_Java - docker: - - image: cimg/base:stable - auth: - username: mydockerhub-user - password: $DOCKERHUB_PASSWORD - steps: - - checkout - - run: - name: APT Install Java - command: sudo apt-get update && sudo apt-get install openjdk-17-jdk - - run: - name: Build - command: ./gradlew jar - - run: - name: Test - command: ./gradlew test - - store_test_results: - path: ./build/test-results/test - -workflows: - main: - jobs: - - ant-build-and-test - - gradle-build-and-test From 8215486033a87f31e7a31a3ad3c5db94a4e1da4e Mon Sep 17 00:00:00 2001 From: "R. Kaleta" Date: Wed, 30 Apr 2025 15:15:30 +0200 Subject: [PATCH 2/6] Update GitHub Actions --- .github/workflows/ant-build-and-test.yml | 34 ++++++++++----------- .github/workflows/gradle-build-and-test.yml | 28 +++++++++-------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/ant-build-and-test.yml b/.github/workflows/ant-build-and-test.yml index 205e997..ad99d55 100644 --- a/.github/workflows/ant-build-and-test.yml +++ b/.github/workflows/ant-build-and-test.yml @@ -1,29 +1,27 @@ -name: GitHub Actions +name: GitHub Actions (ANT) -on: [ push, pull_request ] +on: [push, pull_request] jobs: ant-build-and-test: runs-on: ubuntu-latest + steps: - - uses: actions/checkout@v2 - - name: APT Install Java - run: | - sudo apt-get update && sudo apt-get install openjdk-17-jdk - sudo update-java-alternatives --set java-1.17.0-openjdk-amd64 - - name: APT Install Apache ANT - run: sudo apt-get update && sudo apt-get install ant + - uses: actions/checkout@v4 + + - uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: temurin + - name: Install JUnit5 for ANT run: ./ci/install_ant_junit5.sh + - name: Download Dependencies - run: | - export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 - ant resolve + run: ant resolve + - name: Build - run: | - export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 - ant build + run: ant build + - name: Test - run: | - export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 - ant test + run: ant test diff --git a/.github/workflows/gradle-build-and-test.yml b/.github/workflows/gradle-build-and-test.yml index 1559adc..ad6e139 100644 --- a/.github/workflows/gradle-build-and-test.yml +++ b/.github/workflows/gradle-build-and-test.yml @@ -1,21 +1,23 @@ -name: GitHub Actions +name: GitHub Actions (Gradle) -on: [ push, pull_request ] +on: [push, pull_request] jobs: gradle-build-and-test: runs-on: ubuntu-latest + steps: - - uses: actions/checkout@v2 - - name: APT Install Java - run: | - sudo apt-get update && sudo apt-get install openjdk-17-jdk - sudo update-java-alternatives --set java-1.17.0-openjdk-amd64 + - uses: actions/checkout@v4 + + - uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: temurin + + - uses: gradle/actions/setup-gradle@v4 + - name: Build - run: | - export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 - ./gradlew jar + run: ./gradlew jar + - name: Test - run: | - export JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64 - ./gradlew test + run: ./gradlew test From ba10596b06cb0c717471fba1663404cf0429af62 Mon Sep 17 00:00:00 2001 From: "R. Kaleta" Date: Wed, 30 Apr 2025 15:18:43 +0200 Subject: [PATCH 3/6] Unify GitHub Actions workflow --- ...-build-and-test.yml => build-and-test.yml} | 21 ++++++++++++++++- .github/workflows/gradle-build-and-test.yml | 23 ------------------- 2 files changed, 20 insertions(+), 24 deletions(-) rename .github/workflows/{ant-build-and-test.yml => build-and-test.yml} (55%) delete mode 100644 .github/workflows/gradle-build-and-test.yml diff --git a/.github/workflows/ant-build-and-test.yml b/.github/workflows/build-and-test.yml similarity index 55% rename from .github/workflows/ant-build-and-test.yml rename to .github/workflows/build-and-test.yml index ad99d55..78c19e3 100644 --- a/.github/workflows/ant-build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -1,8 +1,27 @@ -name: GitHub Actions (ANT) +name: GitHub Actions on: [push, pull_request] jobs: + gradle-build-and-test: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + + - uses: actions/setup-java@v4 + with: + java-version: 17 + distribution: temurin + + - uses: gradle/actions/setup-gradle@v4 + + - name: Build + run: ./gradlew jar + + - name: Test + run: ./gradlew test + ant-build-and-test: runs-on: ubuntu-latest diff --git a/.github/workflows/gradle-build-and-test.yml b/.github/workflows/gradle-build-and-test.yml deleted file mode 100644 index ad6e139..0000000 --- a/.github/workflows/gradle-build-and-test.yml +++ /dev/null @@ -1,23 +0,0 @@ -name: GitHub Actions (Gradle) - -on: [push, pull_request] - -jobs: - gradle-build-and-test: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v4 - - - uses: actions/setup-java@v4 - with: - java-version: 17 - distribution: temurin - - - uses: gradle/actions/setup-gradle@v4 - - - name: Build - run: ./gradlew jar - - - name: Test - run: ./gradlew test From 79d8a5b978df0421e456c1f83b8ef83ed1f3348e Mon Sep 17 00:00:00 2001 From: "R. Kaleta" Date: Wed, 30 Apr 2025 23:59:56 +0200 Subject: [PATCH 4/6] Remove JSON array from YAML --- .github/workflows/build-and-test.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 78c19e3..7adde62 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -1,6 +1,8 @@ name: GitHub Actions -on: [push, pull_request] +on: + - push + - pull_request jobs: gradle-build-and-test: From 644e2bf8a8e232b0892dc90714dda19d9893b030 Mon Sep 17 00:00:00 2001 From: "R. Kaleta" Date: Thu, 1 May 2025 12:21:58 +0200 Subject: [PATCH 5/6] Update README badges --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cb16e67..c93eabb 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # AlgoLib_Java -![GitHub Actions](https://github.com/ref-humbold/AlgoLib_Java/workflows/GitHub%20Actions/badge.svg?branch=master) -[![CircleCI](https://circleci.com/gh/ref-humbold/AlgoLib_Java/tree/master.svg?style=shield)](https://circleci.com/gh/ref-humbold/AlgoLib_Java/tree/master) +[![GitHub Actions](https://github.com/ref-humbold/AlgoLib_Java/actions/workflows/build-and-test.yml/badge.svg)](https://github.com/ref-humbold/AlgoLib_Java/actions/workflows/build-and-test.yml) + +![License](https://img.shields.io/github/license/ref-humbold/AlgoLib_Java?style=plastic) ALGOrithms LIBrary - Java version From 24d04ad27a405f5d3954a2eb29eeb08f39dcc772 Mon Sep 17 00:00:00 2001 From: "R. Kaleta" Date: Mon, 5 May 2025 17:09:51 +0200 Subject: [PATCH 6/6] Use variable for workspace directory --- .github/workflows/build-and-test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 7adde62..cb7db67 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -19,10 +19,10 @@ jobs: - uses: gradle/actions/setup-gradle@v4 - name: Build - run: ./gradlew jar + run: $GITHUB_WORKSPACE/gradlew jar - name: Test - run: ./gradlew test + run: $GITHUB_WORKSPACE/gradlew test ant-build-and-test: runs-on: ubuntu-latest @@ -36,7 +36,7 @@ jobs: distribution: temurin - name: Install JUnit5 for ANT - run: ./ci/install_ant_junit5.sh + run: $GITHUB_WORKSPACE/ci/install_ant_junit5.sh - name: Download Dependencies run: ant resolve