DOPE-222: merge main into branch

ergon · Jun 20, 2024 · 32bfbd5 · 32bfbd5
1 parent f61e287
commit 32bfbd5
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/.github/workflows/kotlin_ci.yml b/.github/workflows/kotlin_ci.yml
@@ -11,16 +11,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - name: Checkout target branch
-      uses: actions/checkout@v3
-      with:
-        ref: main
+    - name: Checkout branch
+      uses: actions/checkout@v4
 
     - name: Pull changes from head branch into target branch
-      run: git pull origin ${{ github.event.pull_request.head.ref }} --allow-unrelated-histories --rebase
+      run: git pull origin main
 
     - name: Set up JDK 17
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '17'
         distribution: 'adopt'