undo changes to ignored workflows, dont pin minor version

ClickHouse · Jul 26, 2024 · 4c9a072 · 4c9a072
1 parent cda660b
commit 4c9a072
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 24 deletions.
diff --git a/.github/workflows/build-and-test-arm.yml b/.github/workflows/build-and-test-arm.yml
@@ -51,7 +51,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "~1.21.0"
+          go-version: "~1.22.5"
           cache: false
       - name: Cache Go
         id: go-cache

diff --git a/.github/workflows/build-and-test-windows.yml b/.github/workflows/build-and-test-windows.yml
@@ -58,7 +58,7 @@ jobs:
         run: Install-WindowsFeature -name Web-Server -IncludeManagementTools
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.0"
+          go-version: "1.21.12"
           cache: false
       - name: Cache Go
         id: go-mod-cache

diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
@@ -26,7 +26,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.0"
+          go-version: "1.21.12"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -92,7 +92,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.0"
+          go-version: "1.21.12"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -161,7 +161,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: "1.21.0"
+          go-version: "1.21.12"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -184,7 +184,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.0"
+          go-version: "1.21.12"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -219,10 +219,23 @@ jobs:
         run: |
           make gotidy
           git diff --exit-code || (echo 'go.mod/go.sum deps changes detected, please run "make gotidy" and commit the changes in this PR.' && exit 1)
+      - name: Gen genotelcontribcol
+        run: |
+          make genotelcontribcol
+          git diff -s --exit-code || (echo 'Generated code is out of date, please run "make genotelcontribcol" and commit the changes in this PR.' && exit 1)
+      - name: Gen genoteltestbedcol
+        run: |
+          make genoteltestbedcol
+          git diff -s --exit-code || (echo 'Generated code is out of date, please run "make genoteltestbedcol" and commit the changes in this PR.' && exit 1)
       - name: Gen distributions
         run: |
           make gendistributions
           git diff -s --exit-code || (echo 'Generated code is out of date, please run "make gendistributions" and commit the changes in this PR.' && exit 1)
+      - name: Gen CODEOWNERS
+        if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/v')) && github.repository == 'open-telemetry/opentelemetry-collector-contrib'
+        run: |
+          GITHUB_TOKEN=${{ secrets.READ_ORG_AND_USER_TOKEN }} make gengithub
+          git diff -s --exit-code || (echo 'Generated code is out of date, please apply this diff and commit the changes in this PR.' && git diff && exit 1)
       - name: CodeGen
         run: |
           make -j2 generate
@@ -232,11 +245,15 @@ jobs:
           fi
       - name: MultimodVerify
         run: make multimod-verify
+      - name: Components dropdown in issue templates
+        run: |
+          make generate-gh-issue-templates
+          git diff --exit-code '.github/ISSUE_TEMPLATE' || (echo 'Dropdowns in issue templates are out of date, please run "make generate-gh-issue-templates" and commit the changes in this PR.' && exit 1)
   unittest-matrix:
     strategy:
       fail-fast: false
       matrix:
-        go-version: ["1.21.0"] # 1.20 is interpreted as 1.2 without quotes
+        go-version: ["1.22.5", "1.21.12"] # 1.20 is interpreted as 1.2 without quotes
         runner: [ubuntu-latest]
         group:
           - receiver-0
@@ -352,7 +369,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.0"
+          go-version: "1.21.12"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -390,7 +407,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.0"
+          go-version: "1.21.12"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -416,7 +433,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.0"
+          go-version: "1.21.12"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -486,7 +503,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.0"
+          go-version: "1.21.12"
           cache: false
       - name: Cache Go
         id: go-cache
@@ -587,7 +604,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: "1.21.0"
+          go-version: "1.21.12"
           cache: false
       - name: Mkdir bin and dist
         run: |

diff --git a/.github/workflows/build-test-publish.yaml b/.github/workflows/build-test-publish.yaml
@@ -27,7 +27,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.21.0"
+          go-version: "1.21"
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3
@@ -70,7 +70,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.21.0"
+          go-version: "1.21"
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3
@@ -117,7 +117,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.21.0"
+          go-version: "1.21"
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3
@@ -149,12 +149,10 @@ jobs:
       - name: Gen genotelcontribcol
         run: |
           make genotelcontribcol
-          git diff
           git diff -s --exit-code || (echo 'Generated code is out of date, please run "make genotelcontribcol" and commit the changes in this PR.' && exit 1)
       - name: Gen genoteltestbedcol
         run: |
           make genoteltestbedcol
-          git diff
           git diff -s --exit-code || (echo 'Generated code is out of date, please run "make genoteltestbedcol" and commit the changes in this PR.' && exit 1)
       - name: CodeGen
         run: |
@@ -165,7 +163,7 @@ jobs:
   unittest-matrix:
     strategy:
       matrix:
-        go-version: ["1.21.0"]
+        go-version: ["1.21"]
         group:
           - receiver-0
           - receiver-1
@@ -214,7 +212,7 @@ jobs:
     if: ${{ github.actor != 'dependabot[bot]' && always() }}
     strategy:
       matrix:
-        go-version: ["1.21.0"]
+        go-version: ["1.21"]
     runs-on: ubuntu-latest
     needs: [setup-environment, unittest-matrix]
     steps:
@@ -239,7 +237,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.21.0"
+          go-version: "1.21"
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3
@@ -260,7 +258,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.21.0"
+          go-version: "1.21"
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3
@@ -287,7 +285,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.21.0"
+          go-version: "1.21"
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3
@@ -339,7 +337,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.21.0"
+          go-version: "1.21"
       - name: Cache Go
         id: go-cache
         uses: actions/cache@v3
@@ -375,7 +373,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v3
         with:
-          go-version: "1.21.0"
+          go-version: "1.21"
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
       - name: Set up Docker Buildx