Merge pull request #441 from ClemsonRSRG/dependabot-target-branch

Set the default target branch to "main"
ClemsonRSRG · May 13, 2024 · 3c73185 · 3c73185
2 parents 67fc69f + 98a1adc
commit 3c73185
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,8 +5,9 @@ updates:
     schedule:
       interval: daily
       time: "10:00"
+    target-branch: "main"
     open-pull-requests-limit: 10
     reviewers:
       - yushan87
     labels:
-      - dependencies
+      - dependencies
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -5,24 +5,24 @@ name: RESOLVE (Custom Java CI with Maven)
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   # This job checks that our Java files have the proper license header.
   check_license:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
       - name: Cache Maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -35,14 +35,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: '11'
       - name: Cache Maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -56,17 +56,17 @@ jobs:
     strategy:
       matrix:
         java-dist: [ 'corretto', 'liberica', 'microsoft', 'temurin', 'semeru', 'zulu' ]
-        java: [ '11', '17' ]
+        java: [ '11', '17', '21' ]
 
     steps:
-      - uses: actions/checkout@v3
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - uses: actions/checkout@v4
+      - name: Set up Java JDK
+        uses: actions/setup-java@v4
         with:
           distribution: ${{ matrix.java-dist }}
           java-version: ${{ matrix.java }}
       - name: Cache Maven packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -163,4 +163,4 @@ jobs:
 #          "${GITHUB_WORKSPACE}/bin/runProveTests"
 #
 #          # Delete temporary folder
-#          rm -rf "${GITHUB_WORKSPACE}/temp"
+#          rm -rf "${GITHUB_WORKSPACE}/temp"