Merge pull request #22 from ajoberstar/reco

major: Change from ike.cljj to org.ajoberstar.cljj
ajoberstar · Aug 13, 2022 · bddc6c8 · bddc6c8
2 parents 23aacf2 + c4e3261
commit bddc6c8
Show file tree

Hide file tree

Showing 22 changed files with 487 additions and 610 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -0,0 +1,38 @@
+name: CI
+on:
+  push:
+    branches: [main]
+  pull_request:
+jobs:
+  check:
+    runs-on: ubuntu-latest
+    timeout-minutes: 10
+    env:
+      GRADLE_OPTS: -Dorg.gradle.java.installations.fromEnv=JAVA_HOME_8_x64,JAVA_HOME_11_x64,JAVA_HOME_17_x64
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Setup Java 8
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 8
+      - name: Setup Java 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+      - name: Setup Java 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v1
+      - name: Gradle check
+        run: ./gradlew check
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -1,66 +1,40 @@
 name: Release
 on:
   push:
-    tags:
-      - "*"
+    tags: ["*"]
 jobs:
   check:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [8, 11, 15]
-      fail-fast: false
+    timeout-minutes: 10
+    env:
+      GRADLE_OPTS: -Dorg.gradle.java.installations.fromEnv=JAVA_HOME_8_x64,JAVA_HOME_11_x64,JAVA_HOME_17_x64
     steps:
-      - name: "Checkout repo"
-        uses: "actions/checkout@v2"
+      - name: Checkout repo
+        uses: actions/checkout@v3
         with:
           fetch-depth: 0
-      - name: "Setup Java ${{ matrix.java }}"
-        uses: "actions/setup-java@v1"
-        with:
-          java-version: ${{ matrix.java }}
-      - name: "Validate Gradle Wrapper"
-        uses: gradle/wrapper-validation-action@v1
-      - name: "Cache Gradle wrapper"
-        uses: "actions/cache@v2"
-        with:
-          path: |
-            ~/.gradle/wrapper
-            ~/.gradle/notifications
-          key: "gradle-wrapper-${{ runner.os }}-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}"
-      - name: "Cache Gradle dependencies"
-        uses: "actions/cache@v2"
-        with:
-          path: "~/.gradle/caches"
-          key: "gradle-caches-${{ runner.os }}-${{ hashFiles('build.gradle') }}"
-      - name: "Gradle check"
-        run: "./gradlew check --continue"
-  publish:
-    runs-on: ubuntu-latest
-    needs: check
-    steps:
-      - name: "Checkout repo"
-        uses: "actions/checkout@v2"
-        with:
-          fetch-depth: 0
-      - name: "Setup Java"
-        uses: "actions/setup-java@v1"
+      - name: Setup Java 8
+        uses: actions/setup-java@v3
         with:
+          distribution: temurin
           java-version: 8
-      - name: "Cache Gradle wrapper"
-        uses: "actions/cache@v2"
-        with:
-          path: |
-            ~/.gradle/wrapper
-            ~/.gradle/notifications
-          key: "gradle-wrapper-${{ runner.os }}-${{ hashFiles('gradle/wrapper/gradle-wrapper.properties') }}"
-      - name: "Cache Gradle dependencies"
-        uses: "actions/cache@v2"
-        with:
-          path: "~/.gradle/caches"
-          key: "gradle-caches-${{ runner.os }}-${{ hashFiles('build.gradle') }}"
-      - name: "Gradle publish"
+      - name: Setup Java 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 11
+      - name: Setup Java 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
+
+      - name: Validate Gradle Wrapper
+        uses: gradle/wrapper-validation-action@v1
+      - name: Setup Gradle
+        uses: gradle/gradle-build-action@v2
+      - name: Gradle publish
+        run: ./gradlew publish
         env:
           CLOJARS_USER: ${{ secrets.CLOJARS_USER }}
-          CLOJARS_PASSWORD: ${{ secrets.CLOJARS_PASSWORD }}
-        run: "./gradlew publish"
+          CLOJARS_TOKEN: ${{ secrets.CLOJARS_TOKEN }}