Merge pull request #212 from raynigon/feature/upgrade-ci-cd

Upgrade CI/CD
raynigon · May 2, 2024 · c834d09 · c834d09
2 parents 79c43f6 + d160e00
commit c834d09
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 26 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,6 +1,10 @@
 # Basic set up for gradle package manager
 version: 2
 updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
   - package-ecosystem: "gradle"
     directory: "/"
     schedule:

diff --git a/.github/workflows/cd-release.yml b/.github/workflows/cd-release.yml
@@ -11,31 +11,31 @@ jobs:
         with:
           fetch-depth: 0
       - name: "Setup Java JDK"
-        uses: actions/setup-java@v1.4.3
+        uses: actions/setup-java@v4.2.1
         with:
-          java-version: 11
+          java-version: 21
+          distribution: adopt
+      - name: "Setup gradle"
+        uses: gradle/actions/setup-gradle@v3.3.2
       - name: Build base image
         run: |
-          docker build -t ghcr.io/raynigon/raylevation-gdal-base:3.4.3 .
+          docker build -t ghcr.io/raynigon/raylevation-gdal-base:3.8.5 .
       - id: vars
         name: "Determine Tag Name"
         run: |
           VERSION_LINE=$(cat gradle.properties | grep "version=")
           CURRENT_VERSION=${VERSION_LINE//version=/}
           TAG_VERSION=v${CURRENT_VERSION//-SNAPSHOT/}
-          echo ::set-output name=version::${CURRENT_VERSION//-SNAPSHOT/}
-          echo ::set-output name=tag::$TAG_VERSION
+          echo "version=${CURRENT_VERSION//-SNAPSHOT/}" >> $GITHUB_OUTPUT
+          echo "tag=$TAG_VERSION" >> $GITHUB_OUTPUT
       - name: "Prepare Git"
         run: |
           git config --global user.email "84719472+raynigon-bot@users.noreply.github.com"
           git config --global user.name "raynigon[bot]"
           git checkout -b release
       - name: "Publish Artifacts"
         uses: eskatos/gradle-command-action@cd3cedc781988c804f626f4cd2dc51d0bdf02a12 #v2.2.1
-        with:
-          arguments: ":release -Prelease.useAutomaticVersion=true -x check"
-          wrapper-cache-enabled: true
-          dependencies-cache-enabled: true
+        run: "./gradlew :release -Prelease.useAutomaticVersion=true -x check"
         env:
           GITHUB_USERNAME: raynigon
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml
@@ -31,18 +31,14 @@ jobs:
         with:
           java-version: 17
           distribution: adopt
+      - name: "Setup gradle"
+        uses: gradle/actions/setup-gradle@v3.3.2
       - name: Kotlin Linter
-        uses: eskatos/gradle-command-action@v1.3.2
-        with:
-          arguments: ktlintCheck
+        run: "./gradlew ktlintCheck"
       - name: Checkstyle Linter
-        uses: eskatos/gradle-command-action@v1.3.2
-        with:
-          arguments: checkstyleMain
+        run: "./gradlew checkstyleMain"
       - name: PMD Linter
-        uses: eskatos/gradle-command-action@v1.3.2
-        with:
-          arguments: pmdMain
+        run: "./gradlew pmdMain"
       - uses: jwgmeligmeyling/checkstyle-github-action@master
         with:
           path: '**/checkstyle/main.xml'
@@ -64,18 +60,16 @@ jobs:
         with:
           java-version: 17
           distribution: adopt
+      - name: "Setup gradle"
+        uses: gradle/actions/setup-gradle@v3.3.2
       - name: Login to DockerHub
         uses: docker/login-action@v1
         with:
           registry: "ghcr.io"
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Gradle Command - jibDockerBuild
-        uses: eskatos/gradle-command-action@v1.3.3
-        with:
-          arguments: jibDockerBuild -x check
-          wrapper-cache-enabled: true
-          dependencies-cache-enabled: true
+        run: "./gradlew jibDockerBuild -x check"
       - name: Test Docker Image
         run: ".github/scripts/test-docker-image.sh"
         timeout-minutes: 2
@@ -89,10 +83,10 @@ jobs:
         with:
           java-version: 17
           distribution: adopt
+      - name: "Setup gradle"
+        uses: gradle/actions/setup-gradle@v3.3.2
       - name: Generate javadoc
-        uses: eskatos/gradle-command-action@v1.3.2
-        with:
-          arguments: dokkaHtml
+        run: "./gradlew dokkaHtml"
       - name: Upload Dokka
         uses: sebastianpopp/ftp-action@releases/v2
         if: github.ref == 'refs/heads/main' || contains(github.ref, 'refs/tags/')