Merge branch 'main' into add-test

k8snetworkplumbingwg · Feb 6, 2025 · bce677b · bce677b
2 parents 84dfb8e + f0e150d
commit bce677b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.github/workflows/build-daemon-image.yaml b/.github/workflows/build-daemon-image.yaml
@@ -4,7 +4,7 @@ env:
 on:
   push:
     branches:
-      - master
+      - main
   workflow_dispatch:
 jobs:
       push-daemon-image:

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -2,9 +2,9 @@ name: "CodeQL"
 
 on:
   push:
-    branches: [ "master" ]
+    branches: [ "main" ]
   pull_request:
-    branches: [ "master" ]
+    branches: [ "main" ]
   schedule:
     - cron: "46 8 * * 0"
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -4,7 +4,7 @@ jobs:
   test:
     strategy:
       matrix:
-        go-version: [1.22.x, 1.23.x]
+        go-version: [1.23.x]
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -16,4 +16,3 @@ jobs:
     - name: Checkouts code
       uses: actions/checkout@v4
 
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ env: @@
     on:
       push:
         branches:
-          - master
+          - main
       workflow_dispatch:
     jobs:
           push-daemon-image:
@@ Expand Down @@