diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 00000000..e3918048 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +version: 2 +updates: + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + - package-ecosystem: "gradle" + directory: "/" + schedule: + interval: "weekly" + open-pull-requests-limit: 10 diff --git a/.github/workflows/auto-dependabot.yml b/.github/workflows/auto-dependabot.yml new file mode 100644 index 00000000..390c1232 --- /dev/null +++ b/.github/workflows/auto-dependabot.yml @@ -0,0 +1,23 @@ +name: Dependabot auto-merge +on: pull_request + +permissions: + pull-requests: write + contents: write + +jobs: + dependabot: + runs-on: ubuntu-latest + if: github.event.pull_request.user.login == 'dependabot[bot]' + steps: + - name: Dependabot metadata + id: metadata + uses: dependabot/fetch-metadata@v2.2.0 + with: + github-token: "${{secrets.GITHUB_TOKEN}}" + - name: Enable auto-merge for Dependabot PRs + if: ${{steps.metadata.outputs.update-type == 'version-update:semver-patch'}} + run: gh pr merge --auto --squash "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3dfc119b..dc193378 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,20 +10,14 @@ jobs: building: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: validate gradle wrapper - uses: gradle/wrapper-validation-action@v1 + uses: gradle/wrapper-validation-action@v2 - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v4 with: - java-version: 11 - - - name: Cache Gradle packages - uses: actions/cache@v2 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - restore-keys: ${{ runner.os }}-gradle + java-version: 17 + distribution: 'microsoft' - name: Build project run: ./gradlew build @@ -32,7 +26,7 @@ jobs: run: ./gradlew test - name: Upload Nightly Build - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v4 if: success() with: name: skript-nightly diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 77c4b493..8248898c 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -9,24 +9,15 @@ on: jobs: testing: runs-on: ubuntu-latest - strategy: - matrix: - java-version: [11, 13] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: validate gradle wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Set up JDK ${{ matrix.java-version }} - uses: actions/setup-java@v1 + uses: gradle/wrapper-validation-action@v2 + - name: Set up JDK + uses: actions/setup-java@v4 with: - java-version: ${{ matrix.java-version }} - - - name: Cache Gradle packages - uses: actions/cache@v2 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - restore-keys: ${{ runner.os }}-gradle + java-version: 17 + distribution: 'microsoft' - name: Build skript-parser run: ./gradlew build