diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f32c482..aa08b81 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -4,10 +4,17 @@ jobs: gradle: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v6 + - uses: actions/setup-java@v4 with: - java-version: 8 - - uses: gradle/gradle-build-action@v2.4.2 + distribution: 'zulu' + java-version: | + 8 + 11 + 21 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v5 with: - arguments: test \ No newline at end of file + cache-overwrite-existing: true + - name: Gradle test + run: ./gradlew --stacktrace build \ No newline at end of file diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 0000000..e4dbae0 --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,28 @@ +name: Deploy +on: + push: + branches: + - 'main' +jobs: + gradle: + runs-on: ubuntu-latest + env: + NEOCITIES_API_KEY: ${{ secrets.NEOCITIES_API_KEY }} + steps: + - uses: actions/checkout@v6 + - uses: actions/setup-java@v4 + with: + distribution: 'zulu' + java-version: | + 8 + 11 + 21 + - name: Get Version + run: | + echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v5 + with: + cache-overwrite-existing: true + - name: Gradle publish + run: ./gradlew --stacktrace -Pneocities.apiKey=${{ secrets.NEOCITIES_API_KEY }} personal-site:run diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 692ecfb..ac7b57b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,16 +8,23 @@ jobs: gradle: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v6 + - uses: actions/setup-java@v4 with: - java-version: 8 + distribution: 'zulu' + java-version: | + 8 + 11 + 21 - name: Get Version run: | echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV - - uses: gradle/gradle-build-action@v2.4.2 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@v5 with: - arguments: publish -Pversion=${{ env.VERSION }} -PpackageCloudKey=${{ secrets.PACKAGECLOUD_TOKEN }} + cache-overwrite-existing: true + - name: Gradle publish + run: ./gradlew --stacktrace publish -Pversion=${{ env.VERSION }} -PpackageCloudKey=${{ secrets.PACKAGECLOUD_TOKEN }} - name: Create Release id: create_release uses: actions/create-release@v1 diff --git a/personal-site/build.gradle.kts b/personal-site/build.gradle.kts index 6e9bfc2..6d1a9e7 100644 --- a/personal-site/build.gradle.kts +++ b/personal-site/build.gradle.kts @@ -31,7 +31,7 @@ dependencies { testing { suites { - named("test"){ + named("test") { useJUnitJupiter() targets.all { testTask.configure {