From 922f921d07e3f908caf08fb19c4d461ae7ee88d3 Mon Sep 17 00:00:00 2001 From: Dj Isaac Date: Sun, 12 Jun 2022 20:38:47 -0500 Subject: [PATCH] :green_heart: Fix GitHub Actions Also switches to good ol actions/cache because of https://github.com/actions/setup-java/issues/269 --- .github/workflows/ci.yml | 16 ++++++++++++---- .github/workflows/docs.yml | 17 +++++++++++++---- .github/workflows/release.yml | 25 ++++++++++++++++++++++++- build.gradle.kts | 13 ++++++++++++- 4 files changed, 61 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4d915e8f..9c35f84c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,8 +11,8 @@ on: jobs: build: - name: Test on Java 17 - runs-on: ubuntu-latest + name: Build on Java 17 + runs-on: ubuntu-22.04 steps: - name: Checkout @@ -23,10 +23,18 @@ jobs: with: distribution: 'corretto' java-version: '17' - cache: 'gradle' - name: Validate Gradle uses: gradle/wrapper-validation-action@v1 + - name: Cache Gradle Wrapper and Dependencies + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle/wrapper/gradle-wrapper.properties') }} + - name: Build with Gradle - run: ./gradlew build + run: ./gradlew build --no-daemon + diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index b0467819..48d8c3aa 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,4 +1,4 @@ -name: Build documentation +name: Generate Javadocs on: push: @@ -6,7 +6,9 @@ on: jobs: javadoc: - runs-on: ubuntu-latest + name: Generate Javadocs + runs-on: ubuntu-22.04 + steps: - name: Checkout uses: actions/checkout@v2 @@ -16,13 +18,20 @@ jobs: with: distribution: 'corretto' java-version: '17' - cache: 'gradle' - name: Validate Gradle uses: gradle/wrapper-validation-action@v1 + - name: Cache Gradle Wrapper and Dependencies + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle/wrapper/gradle-wrapper.properties') }} + - name: Build Javadoc - run: ./gradlew javadocs + run: ./gradlew javadoc --no-daemon # - name: Checkout website repository # uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a01b0b86..352d9bee 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,13 +15,16 @@ name: Publish new release on: + workflow_dispatch: push: tags: - 'v*' jobs: publish: - runs-on: ubuntu-latest + name: Publish Release + runs-on: ubuntu-22.04 + steps: - name: Checkout uses: actions/checkout@v2 @@ -32,3 +35,23 @@ jobs: distribution: 'corretto' java-version: '17' cache: 'gradle' + + - name: Validate Gradle + uses: gradle/wrapper-validation-action@v1 + + - name: Cache Gradle Wrapper and Dependencies + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-cache-${{ hashFiles('**/*.gradle', '**/*.gradle.kts', '**/gradle/wrapper/gradle-wrapper.properties') }} + + - name: Build with Gradle + run: ./gradlew build --no-daemon + + - name: Publish to GitHub Packages + run: gradle publish + env: + USERNAME: ${{ github.actor }} + PASSWORD: ${{ secrets.GITHUB_TOKEN }} diff --git a/build.gradle.kts b/build.gradle.kts index b1408af9..41c3fba0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -59,7 +59,18 @@ tasks { } publishing { - publications.create("maven") { + repositories { + maven { + name = "GitHubPackages" + url = uri("https://maven.pkg.github.com/DeJayDev/ezLib") + credentials { + username = project.findProperty("gpr.user") as String? ?: System.getenv("USERNAME") + password = project.findProperty("gpr.key") as String? ?: System.getenv("TOKEN") + } + } + } + + publications.create("gpr") { from(components["java"]) } } \ No newline at end of file