From c770058f2b7f4aacfd5d267fde1d9f8540f78d8e Mon Sep 17 00:00:00 2001 From: yamatcha Date: Mon, 4 Dec 2023 05:35:23 +0000 Subject: [PATCH 1/2] Upgrade actions in CI --- .../workflows/build-fluent-bit-container.yaml | 10 +++---- .github/workflows/build-mysql-container.yaml | 20 ++++++------- .../build-mysqld-exporter-container.yaml | 10 +++---- .github/workflows/ci-e2e.yaml | 4 +-- .github/workflows/ci.yaml | 8 +++--- .github/workflows/dbtest.yaml | 4 +-- .github/workflows/e2e.yaml | 4 +-- .github/workflows/helm-release.yaml | 4 +-- .github/workflows/helm.yaml | 6 ++-- .github/workflows/mdbook.yaml | 4 +-- .github/workflows/release.yaml | 28 +++++++++---------- .github/workflows/weekly.yaml | 4 +-- 12 files changed, 53 insertions(+), 53 deletions(-) diff --git a/.github/workflows/build-fluent-bit-container.yaml b/.github/workflows/build-fluent-bit-container.yaml index c2043b0d4..d2d21bfd9 100644 --- a/.github/workflows/build-fluent-bit-container.yaml +++ b/.github/workflows/build-fluent-bit-container.yaml @@ -18,11 +18,11 @@ jobs: build: runs-on: ${{ vars.IMAGE_BUILD_RUNNER || 'ubuntu-20.04' }} steps: - - uses: actions/checkout@v3 - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -37,7 +37,7 @@ jobs: fi echo "TAG=$(cat ./fluent-bit/TAG)" >> $GITHUB_ENV - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: containers/fluent-bit/. platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/build-mysql-container.yaml b/.github/workflows/build-mysql-container.yaml index d02348ad2..7a84ef5e4 100644 --- a/.github/workflows/build-mysql-container.yaml +++ b/.github/workflows/build-mysql-container.yaml @@ -20,7 +20,7 @@ jobs: outputs: mysql-versions: ${{ steps.filter.outputs.mysql-versions }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: filter id: filter working-directory: containers @@ -47,12 +47,12 @@ jobs: mysql-version: ${{ fromJson(needs.filter.outputs.mysql-versions) }} k8s-version: [ "1.27.1" ] steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v4 with: go-version-file: go.mod cache: true - - uses: docker/setup-buildx-action@v2 + - uses: docker/setup-buildx-action@v3 with: driver: docker # refs: https://github.com/docker/build-push-action/issues/321 @@ -64,7 +64,7 @@ jobs: echo "tag: $TAG" echo "tag=$TAG" >> "$GITHUB_OUTPUT" - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: containers/mysql/${{ matrix.mysql-version }}/. push: false @@ -112,11 +112,11 @@ jobs: matrix: mysql-version: ${{ fromJson(needs.filter.outputs.mysql-versions) }} steps: - - uses: actions/checkout@v3 - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -130,7 +130,7 @@ jobs: echo "tag: $TAG" echo "tag=$TAG" >> "$GITHUB_OUTPUT" - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: containers/mysql/${{ matrix.mysql-version }}/. platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/build-mysqld-exporter-container.yaml b/.github/workflows/build-mysqld-exporter-container.yaml index 3558a1001..92422e00e 100644 --- a/.github/workflows/build-mysqld-exporter-container.yaml +++ b/.github/workflows/build-mysqld-exporter-container.yaml @@ -18,11 +18,11 @@ jobs: build: runs-on: ${{ vars.IMAGE_BUILD_RUNNER || 'ubuntu-20.04' }} steps: - - uses: actions/checkout@v3 - - uses: docker/setup-qemu-action@v2 - - uses: docker/setup-buildx-action@v2 + - uses: actions/checkout@v4 + - uses: docker/setup-qemu-action@v3 + - uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.actor }} @@ -37,7 +37,7 @@ jobs: fi echo "TAG=$(cat ./mysqld_exporter/TAG)" >> $GITHUB_ENV - - uses: docker/build-push-action@v4 + - uses: docker/build-push-action@v5 with: context: containers/mysqld_exporter/. platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/ci-e2e.yaml b/.github/workflows/ci-e2e.yaml index e4ea72ff7..cee1f6376 100644 --- a/.github/workflows/ci-e2e.yaml +++ b/.github/workflows/ci-e2e.yaml @@ -62,8 +62,8 @@ jobs: runs-on: group: moco steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v4 with: go-version-file: go.mod cache: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 84d9d2884..0ecb2458e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -18,8 +18,8 @@ jobs: name: Build binaries runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v4 with: go-version-file: go.mod cache: true @@ -29,8 +29,8 @@ jobs: name: Small tests runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v4 with: go-version-file: go.mod cache: true diff --git a/.github/workflows/dbtest.yaml b/.github/workflows/dbtest.yaml index 8f2c7776a..59ed0c0e1 100644 --- a/.github/workflows/dbtest.yaml +++ b/.github/workflows/dbtest.yaml @@ -11,8 +11,8 @@ jobs: dbtest: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v4 with: go-version-file: go.mod cache: true diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 45ca3ebad..feaf3c9c3 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -15,8 +15,8 @@ jobs: runs-on: group: moco steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v4 with: go-version-file: go.mod cache: true diff --git a/.github/workflows/helm-release.yaml b/.github/workflows/helm-release.yaml index 0b65544b0..6d4bd5bfb 100644 --- a/.github/workflows/helm-release.yaml +++ b/.github/workflows/helm-release.yaml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-20.04 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -41,7 +41,7 @@ jobs: runs-on: ubuntu-20.04 needs: build steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: gh-pages diff --git a/.github/workflows/helm.yaml b/.github/workflows/helm.yaml index 1d5dc3bd5..a1891dac1 100644 --- a/.github/workflows/helm.yaml +++ b/.github/workflows/helm.yaml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 @@ -21,7 +21,7 @@ jobs: python-version: 3.7 - name: Set up chart-testing - uses: helm/chart-testing-action@v2.3.1 + uses: helm/chart-testing-action@v2.6.1 - name: Run chart-testing (list-changed) id: list-changed @@ -34,7 +34,7 @@ jobs: run: ct lint --config ct.yaml - name: Create kind cluster - uses: helm/kind-action@v1.4.0 + uses: helm/kind-action@v1.8.0 if: steps.list-changed.outputs.changed == 'true' with: version: v0.19.0 diff --git a/.github/workflows/mdbook.yaml b/.github/workflows/mdbook.yaml index fcb4f88ae..c6271fba2 100644 --- a/.github/workflows/mdbook.yaml +++ b/.github/workflows/mdbook.yaml @@ -9,7 +9,7 @@ jobs: name: Build book runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: make book - uses: actions/upload-artifact@v3 with: @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-20.04 needs: build steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: gh-pages # ignore helm chart index file and chart archive file. diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 1497a5609..60cfbf7d9 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -8,23 +8,23 @@ jobs: name: Push Container Image runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: platforms: linux/amd64 - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: ghcr.io/cybozu-go/moco flavor: latest=false @@ -33,7 +33,7 @@ jobs: type=semver,pattern={{version}} - name: Build id: docker_build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: builder: ${{ steps.buildx.outputs.name }} push: true @@ -47,23 +47,23 @@ jobs: name: Push Container Image runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 with: platforms: linux/amd64 - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: Login to GitHub Container Registry - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: ghcr.io/cybozu-go/moco-backup flavor: latest=false @@ -72,7 +72,7 @@ jobs: type=semver,pattern={{version}} - name: Build id: docker_build - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v5 with: builder: ${{ steps.buildx.outputs.name }} push: true @@ -86,8 +86,8 @@ jobs: needs: [build-moco, build-moco-backup] runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v4 with: go-version-file: go.mod - name: GoReleaser diff --git a/.github/workflows/weekly.yaml b/.github/workflows/weekly.yaml index 82dbf57f9..d6125ccd6 100644 --- a/.github/workflows/weekly.yaml +++ b/.github/workflows/weekly.yaml @@ -48,8 +48,8 @@ jobs: name: Upgrade Test runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/checkout@v4 + - uses: actions/setup-go@v4 with: go-version-file: go.mod cache: true From 0219f39d337a3a139ced06177af04435ec138955 Mon Sep 17 00:00:00 2001 From: yamatcha Date: Tue, 5 Dec 2023 07:09:57 +0000 Subject: [PATCH 2/2] Not exit with code 1 when tag is already exists --- .github/workflows/build-fluent-bit-container.yaml | 3 ++- .github/workflows/build-mysqld-exporter-container.yaml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-fluent-bit-container.yaml b/.github/workflows/build-fluent-bit-container.yaml index d2d21bfd9..2687e8f04 100644 --- a/.github/workflows/build-fluent-bit-container.yaml +++ b/.github/workflows/build-fluent-bit-container.yaml @@ -33,11 +33,12 @@ jobs: run: | result="$(./tag_exists moco/fluent-bit fluent-bit)" if [ "$result" = ok ]; then - exit 1 + exit 0 fi echo "TAG=$(cat ./fluent-bit/TAG)" >> $GITHUB_ENV - uses: docker/build-push-action@v5 + if: env.TAG != null with: context: containers/fluent-bit/. platforms: linux/amd64,linux/arm64 diff --git a/.github/workflows/build-mysqld-exporter-container.yaml b/.github/workflows/build-mysqld-exporter-container.yaml index 92422e00e..9c7413f14 100644 --- a/.github/workflows/build-mysqld-exporter-container.yaml +++ b/.github/workflows/build-mysqld-exporter-container.yaml @@ -33,11 +33,12 @@ jobs: run: | result="$(./tag_exists moco/mysqld_exporter mysqld_exporter)" if [ "$result" = ok ]; then - exit 1 + exit 0 fi echo "TAG=$(cat ./mysqld_exporter/TAG)" >> $GITHUB_ENV - uses: docker/build-push-action@v5 + if: env.TAG != null with: context: containers/mysqld_exporter/. platforms: linux/amd64,linux/arm64