From 37f76ab3c753b8fb792bfbe0f248053131b79431 Mon Sep 17 00:00:00 2001 From: csuzhangxc Date: Tue, 17 Dec 2024 17:34:38 +0800 Subject: [PATCH 1/3] chore(ci): use GitHub hosted runner to run actions --- .github/workflows/ci.yaml | 10 +++++----- .github/workflows/e2e.yaml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index f78d4bc9e8..7cc15f4309 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -15,7 +15,7 @@ concurrency: jobs: image: - runs-on: self-hosted + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: cache image builder @@ -50,7 +50,7 @@ jobs: V_PLATFORMS=linux/arm64,linux/amd64 make image build: - runs-on: self-hosted + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: setup go @@ -63,7 +63,7 @@ jobs: make build lint: - runs-on: self-hosted + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: setup go @@ -81,7 +81,7 @@ jobs: make lint unit: - runs-on: self-hosted + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: setup go @@ -94,7 +94,7 @@ jobs: make unit verify: - runs-on: self-hosted + runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 - name: setup go diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 4de5bd7304..bbb37a58a3 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -12,7 +12,7 @@ concurrency: jobs: e2e: - runs-on: self-hosted + runs-on: ubuntu-24.04 strategy: fail-fast: false matrix: From 82d1ddf9298f99b3011b13e8d4754307fe31d5b3 Mon Sep 17 00:00:00 2001 From: csuzhangxc Date: Tue, 17 Dec 2024 17:36:36 +0800 Subject: [PATCH 2/3] update target branch for gha --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/e2e.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 7cc15f4309..fa531dff5e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,10 +3,10 @@ name: ci on: push: branches: - - main + - v2 pull_request: branches: - - main + - v2 types: [review_requested, ready_for_review, synchronize] concurrency: diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index bbb37a58a3..0ed595a245 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -3,7 +3,7 @@ name: e2e on: pull_request: branches: - - main + - v2 types: [review_requested, ready_for_review, synchronize] concurrency: From bc11df2518305385fca407a452831d4037dd08c7 Mon Sep 17 00:00:00 2001 From: csuzhangxc Date: Tue, 17 Dec 2024 17:42:18 +0800 Subject: [PATCH 3/3] remove docker hub login --- .github/workflows/ci.yaml | 6 ------ .github/workflows/e2e.yaml | 6 ------ 2 files changed, 12 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index fa531dff5e..b20213bd1b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,12 +24,6 @@ jobs: path: ./_output/cache key: ${{ runner.os }}-image-cache - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - uses: docker/setup-qemu-action@v3 with: image: gcr.io/pingcap-public/third-party/tonistiigi/binfmt:latest diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 0ed595a245..7f973568d0 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -31,12 +31,6 @@ jobs: go-version-file: ./go.work cache-dependency-path: "**/*.sum" - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - uses: docker/setup-qemu-action@v3 with: image: gcr.io/pingcap-public/third-party/tonistiigi/binfmt:latest