From ba29314e3d0020c85c92cceb917f30dcba40c7c8 Mon Sep 17 00:00:00 2001 From: Tobias <5702338+T0biii@users.noreply.github.com> Date: Thu, 25 Sep 2025 20:30:19 +0000 Subject: [PATCH 1/5] bump placeholderapi 2.11.5 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7fd9076..1a2fdde 100644 --- a/pom.xml +++ b/pom.xml @@ -197,7 +197,7 @@ me.clip placeholderapi - 2.10.9 + 2.11.5 provided From 695dfa05b45e69b0665932117a32f6cb88d05e67 Mon Sep 17 00:00:00 2001 From: Tobias <5702338+T0biii@users.noreply.github.com> Date: Thu, 25 Sep 2025 20:32:17 +0000 Subject: [PATCH 2/5] pin github actions versions and use only one workflow --- .github/workflows/default.yml | 15 ++++++------ .github/workflows/pullrequest.yml | 38 ------------------------------- 2 files changed, 8 insertions(+), 45 deletions(-) delete mode 100644 .github/workflows/pullrequest.yml diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index c85953d..60a0977 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -10,9 +10,9 @@ jobs: java: [ 21 ] name: Java ${{ matrix.java }} compile steps: - - uses: actions/checkout@master + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0 - name: Setup java - uses: actions/setup-java@v2 + uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 #v5.0.0 with: distribution: 'adopt' java-version: ${{ matrix.java }} @@ -22,22 +22,23 @@ jobs: needs: compile name: Build Maven project steps: - - uses: actions/checkout@v2 - - uses: actions/cache@v2 + - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #v5.0.0 + - uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 #v4.3.0 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} restore-keys: | ${{ runner.os }}-maven- - name: Set up JDK 21 - uses: actions/setup-java@v2 + uses: actions/setup-java@dded0888837ed1f317902acf8a20df0ad188d165 #v5.0.0 with: distribution: 'adopt' java-version: 21 - name: Build and test project run: mvn clean verify - name: Upload Maven build artifact - uses: actions/upload-artifact@v2 + if: github.ref == 'refs/heads/legacy' + uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 #v4.6.2 with: name: SmoothTimber-Artifact - path: target/SmoothTimber-*.jar + path: target/smoothtimber-*.jar diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml deleted file mode 100644 index 19a5ddf..0000000 --- a/.github/workflows/pullrequest.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: Build SmoothTimber - -on: [pull_request] - -jobs: - compile: - runs-on: ubuntu-latest - strategy: - matrix: - java: [ 21 ] - name: Java ${{ matrix.java }} compile - steps: - - uses: actions/checkout@master - - name: Setup java - uses: actions/setup-java@v2 - with: - distribution: 'adopt' - java-version: ${{ matrix.java }} - - run: mvn clean compile - build: - runs-on: ubuntu-latest - needs: compile - name: Build Maven project - steps: - - uses: actions/checkout@v2 - - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - name: Set up JDK 21 - uses: actions/setup-java@v2 - with: - distribution: 'adopt' - java-version: 21 - - name: Build and test project - run: mvn clean verify From 34d3d5f60d7ef5769f2f7246b153aa80daebb97c Mon Sep 17 00:00:00 2001 From: Tobias <5702338+T0biii@users.noreply.github.com> Date: Thu, 25 Sep 2025 20:32:29 +0000 Subject: [PATCH 3/5] add dependabot --- .github/dependabot.yml | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..8ac6b8c --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,6 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "monthly" From ab73f71a824c3d20ea733eeaa1210116dbaf25f4 Mon Sep 17 00:00:00 2001 From: Tobias <5702338+T0biii@users.noreply.github.com> Date: Fri, 26 Sep 2025 01:05:42 +0200 Subject: [PATCH 4/5] add Upload artifact for all runs --- .github/workflows/default.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index 60a0977..cffa8c2 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -37,7 +37,6 @@ jobs: - name: Build and test project run: mvn clean verify - name: Upload Maven build artifact - if: github.ref == 'refs/heads/legacy' uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 #v4.6.2 with: name: SmoothTimber-Artifact From 3f20e3fde141ebee2d2b4e77cd56dda0d1df1f43 Mon Sep 17 00:00:00 2001 From: Tobias <5702338+T0biii@users.noreply.github.com> Date: Fri, 26 Sep 2025 01:19:18 +0200 Subject: [PATCH 5/5] add pull_request also to the trigger --- .github/workflows/default.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index cffa8c2..a52bbd2 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -1,6 +1,8 @@ name: Build SmoothTimber -on: [push] +on: + push: + pull_request: jobs: compile: