switch to golang 1.22

mblaschke · mblaschke · commit 122274bb0267 · 2024-02-17T12:14:17.000+01:00
Signed-off-by: Markus Blaschke &lt;mblaschke82@gmail.com&gt;
diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,2 @@
-/vendor/
 /azure-devops-exporter
 /release-assets
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -0,0 +1,16 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "weekly"
diff --git a/.github/workflows/build-docker.yaml b/.github/workflows/build-docker.yaml
@@ -1,47 +1,65 @@
-name: "Scheduled: docker"
+name: build/docker
 
 on:
-  schedule:
-    - cron: '0 6 * * 1'
+  workflow_call:
+    inputs:
+      publish:
+        required: true
+        type: boolean
 
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set Swap Space
-        uses: pierotofy/set-swap-space@master
+        uses: pierotofy/set-swap-space@49819abfb41bd9b44fb781159c033dba90353a7c
         with:
           swap-size-gb: 12
 
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          cache-dependency-path: "go.sum"
+          check-latest: true
+
       - name: Run Golangci lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v4
         with:
           version: latest
           args: --print-resources-usage
 
   build:
+    name: "build ${{ matrix.Dockerfile }}:${{ matrix.target }}"
     needs: lint
     strategy:
       fail-fast: false
       matrix:
-        Dockerfile: [Dockerfile]
-        suffix: [""]
-        latest: ["auto"]
-        include: []
+        include:
+          - Dockerfile: Dockerfile
+            target: "final-static"
+            suffix: ""
+            latest: "auto"
+
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set Swap Space
-        uses: pierotofy/set-swap-space@master
+        uses: pierotofy/set-swap-space@49819abfb41bd9b44fb781159c033dba90353a7c
         with:
           swap-size-gb: 12
 
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: 'go.mod'
+          cache-dependency-path: "go.sum"
+          check-latest: true
+
       - name: Docker meta
         id: docker_meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ github.repository }},quay.io/${{ github.repository }}
           labels: |
@@ -51,30 +69,33 @@ jobs:
             suffix=${{ matrix.suffix }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
+        if: ${{ inputs.publish }}
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to Quay
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
+        if: ${{ inputs.publish }}
         with:
           registry: quay.io
           username: ${{ secrets.QUAY_USERNAME }}
           password: ${{ secrets.QUAY_TOKEN }}
 
-      - name: Build and push
-        uses: docker/build-push-action@v2
+      - name: ${{ inputs.publish && 'Build and push' || 'Build' }}
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: ./${{ matrix.Dockerfile }}
+          target: ${{ matrix.target }}
           platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
+          push: ${{ inputs.publish }}
           tags: ${{ steps.docker_meta.outputs.tags }}
           labels: ${{ steps.docker_meta.outputs.labels }}
diff --git a/.github/workflows/ci-docker.yaml b/.github/workflows/ci-docker.yaml
@@ -1,44 +1,10 @@
-name: "CI docker"
+name: "ci/docker"
 
 on: [pull_request, workflow_dispatch]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set Swap Space
-        uses: pierotofy/set-swap-space@master
-        with:
-          swap-size-gb: 12
-
-      - name: Run Golangci lint
-        uses: golangci/golangci-lint-action@v2
-        with:
-          version: latest
-          args: --print-resources-usage
-
-      - name: Docker meta
-        id: docker_meta
-        uses: docker/metadata-action@v3
-        with:
-          images: ${{ github.repository }},quay.io/${{ github.repository }}
-          labels: |
-            io.artifacthub.package.readme-url=https://raw.githubusercontent.com/${{ github.repository }}/${{ github.event.repository.default_branch }}/README.md
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Build
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./Dockerfile
-          push: false
-          platforms: linux/amd64,linux/arm64
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
+    uses: ./.github/workflows/build-docker.yaml
+    secrets: inherit
+    with:
+      publish: false
diff --git a/.github/workflows/release-assets.yaml b/.github/workflows/release-assets.yaml
@@ -1,4 +1,4 @@
-name: "Release: assets"
+name: "release/assets"
 
 on:
   release:
@@ -8,16 +8,17 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set Swap Space
-        uses: pierotofy/set-swap-space@master
+        uses: pierotofy/set-swap-space@49819abfb41bd9b44fb781159c033dba90353a7c
         with:
           swap-size-gb: 12
 
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v5
         with:
-          go-version: '1.19'
+          go-version-file: 'go.mod'
+          cache-dependency-path: "go.sum"
           check-latest: true
 
       - name: Build
diff --git a/.github/workflows/release-docker.yaml b/.github/workflows/release-docker.yaml
@@ -1,83 +1,17 @@
-name: "Release: docker"
+name: "release/docker"
 
 on:
   push:
     branches:
-      - '**'
+      - 'main'
+      - 'feature-**'
+      - 'bugfix-**'
     tags:
       - '*.*.*'
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set Swap Space
-        uses: pierotofy/set-swap-space@master
-        with:
-          swap-size-gb: 12
-
-      - name: Run Golangci lint
-        uses: golangci/golangci-lint-action@v2
-        with:
-          version: latest
-          args: --print-resources-usage
-
-  build:
-    needs: lint
-    strategy:
-      fail-fast: false
-      matrix:
-        Dockerfile: [Dockerfile]
-        suffix: [""]
-        latest: ["auto"]
-        include: []
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Set Swap Space
-        uses: pierotofy/set-swap-space@master
-        with:
-          swap-size-gb: 12
-
-      - name: Docker meta
-        id: docker_meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ${{ github.repository }},quay.io/${{ github.repository }}
-          labels: |
-            io.artifacthub.package.readme-url=https://raw.githubusercontent.com/${{ github.repository }}/${{ github.event.repository.default_branch }}/README.md
-          flavor: |
-            latest=${{ matrix.latest }}
-            suffix=${{ matrix.suffix }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
-
-      - name: Login to DockerHub
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to Quay
-        uses: docker/login-action@v1
-        with:
-          registry: quay.io
-          username: ${{ secrets.QUAY_USERNAME }}
-          password: ${{ secrets.QUAY_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./${{ matrix.Dockerfile }}
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.docker_meta.outputs.tags }}
-          labels: ${{ steps.docker_meta.outputs.labels }}
+  release:
+    uses: ./.github/workflows/build-docker.yaml
+    secrets: inherit
+    with:
+      publish: ${{ github.event_name != 'pull_request' }}
diff --git a/.github/workflows/schedule-docker.yaml b/.github/workflows/schedule-docker.yaml
@@ -0,0 +1,12 @@
+name: "schedule/docker"
+
+on:
+  schedule:
+    - cron: '45 6 * * 1'
+
+jobs:
+  schedule:
+    uses: ./.github/workflows/build-docker.yaml
+    secrets: inherit
+    with:
+      publish: true
diff --git a/Dockerfile b/Dockerfile
@@ -1,7 +1,7 @@
 #############################################
 # Build
 #############################################
-FROM --platform=$BUILDPLATFORM golang:1.19-alpine as build
+FROM --platform=$BUILDPLATFORM golang:1.22-alpine as build
 
 RUN apk upgrade --no-cache --force
 RUN apk add --update build-base make git
@@ -28,9 +28,9 @@ COPY --from=build /go/src/github.com/webdevops/azure-devops-exporter/azure-devop
 RUN ["./azure-devops-exporter", "--help"]
 
 #############################################
-# Final
+# Final-static
 #############################################
-FROM gcr.io/distroless/static
+FROM gcr.io/distroless/static as final-static
 ENV LOG_JSON=1
 WORKDIR /
 COPY --from=test /app .
diff --git a/go.mod b/go.mod
@@ -1,8 +1,6 @@
 module github.com/webdevops/azure-devops-exporter
 
-go 1.21
-
-toolchain go1.22.0
+go 1.22
 
 require (
 	github.com/go-resty/resty/v2 v2.11.0

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`		`-/vendor/`
`2`	`1`	`/azure-devops-exporter`
`3`	`2`	`/release-assets`