Merge branch 'main' into main

weaveworks · Nov 13, 2024 · 09c10a9 · 09c10a9
2 parents ef7dc01 + b6026e0
commit 09c10a9
Show file tree

Hide file tree

Showing 28 changed files with 2,390 additions and 1,891 deletions.
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -3,7 +3,7 @@ name: Docs
 on:
   pull_request:
     branches:
-      - 'main'
+      - 'main-disabled'
     paths:
       - 'website/**'
   push:

diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -58,7 +58,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [1.20.X]
+        go-version: [1.23.X]
     steps:
       - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
       - name: Setup Go
@@ -70,14 +70,16 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - run: make unit-tests
+        # server core fails if ui-tests have not just been run.
+        # was this all the case
       # - run: make lib-test
 
   ci-static:
     name: CI Check Static Checks
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go-version: [1.20.X]
+        go-version: [1.23.X]
         node-version: [16.X]
     steps:
       - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
@@ -187,7 +189,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
       with:
-        go-version: 1.20.X
+        go-version: 1.23.X
     - name: Checkout code
       uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac # v4.0.0
     - name: Clean

diff --git a/.github/workflows/prepare-release.yaml b/.github/workflows/prepare-release.yaml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
-          go-version: 1.20.X
+          go-version: 1.23.X
       - name: Setup Node.js
         uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
         with:
@@ -63,16 +63,16 @@ jobs:
          go install github.com/norwoodj/helm-docs/cmd/[email protected]
          helm-docs -c charts/gitops-server -o ../../website/docs/references/helm-reference.md
          git commit -am "Update the helm reference" || : # This may not have changed
-      - name: Update docs version
-        env:
-          ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
-          GA_KEY: ${{ secrets.GA_KEY }}
-        run: |
-          VERSION=${{ github.event.inputs.version }} make bin/gitops
-          tools/update-docs.sh ${PWD}/bin/gitops ${PWD}/website
-          git add website
-          git commit -m "Update docs for release $GITOPS_VERSION"
-        if: ${{ !contains(github.event.inputs.version, '-') }}
+#      - name: Update docs version
+#        env:
+#          ALGOLIA_API_KEY: ${{ secrets.ALGOLIA_API_KEY }}
+#          GA_KEY: ${{ secrets.GA_KEY }}
+#        run: |
+#          VERSION=${{ github.event.inputs.version }} make bin/gitops
+#          tools/update-docs.sh ${PWD}/bin/gitops ${PWD}/website
+#          git add website
+#          git commit -m "Update docs for release $GITOPS_VERSION"
+#        if: ${{ !contains(github.event.inputs.version, '-') }}
 
       - name: Update README
         run: |

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -128,7 +128,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
-          go-version: 1.20.X
+          go-version: 1.23.X
       - name: Use Node.js
         uses: actions/setup-node@5e21ff4d9bc1a8cf6de233a3057d20ec6b3fb69d # v3.8.1
         with:

diff --git a/.github/workflows/scan.yaml b/.github/workflows/scan.yaml
@@ -24,7 +24,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
-          go-version: 1.20.X
+          go-version: 1.23.X
       - name: Run FOSSA scan and upload build data
         uses: fossa-contrib/fossa-action@6728dc6fe9a068c648d080c33829ffbe56565023 # v2.0.0
         with:
@@ -46,4 +46,4 @@ jobs:
       - name: Autobuild
         uses: github/codeql-action/autobuild@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7
+        uses: github/codeql-action/analyze@04daf014b50eaf774287bf3f0f1869d4b4c4b913 # v2.21.7
diff --git a/.github/workflows/upgrade-flux.yaml b/.github/workflows/upgrade-flux.yaml
@@ -36,7 +36,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0
         with:
-          go-version: 1.20.X
+          go-version: 1.23.X
       - name: Upgrade flux
         run: |
           sed -i 's/^FLUX_VERSION=.*/FLUX_VERSION=${{ needs.has-new-flux.outputs.version }}/' Makefile

diff --git a/.golangci.yaml b/.golangci.yaml
@@ -1,6 +1,6 @@
 run:
   timeout: 5m
-  go: '1.20'
+  go: '1.23'
 
 linters:
   disable-all: true
@@ -83,7 +83,7 @@ linters-settings:
       - performance
       - style
   gofumpt:
-    lang-version: "1.20"
+    lang-version: "1.23"
     extra-rules: true
   lll:
     line-length: 150