Skip to content

Commit fc6321d

Browse files
authored
fix(ci): use ubuntu-latest for running ci (#2407)
Signed-off-by: ashing <axingfly@gmail.com>
1 parent 7b7aa4c commit fc6321d

File tree

8 files changed

+15
-23
lines changed

8 files changed

+15
-23
lines changed

.github/workflows/apisix-conformance-test.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
jobs:
1818
prepare:
1919
name: Prepare
20-
runs-on: buildjet-2vcpu-ubuntu-2204
20+
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout
2323
uses: actions/checkout@v4
@@ -36,7 +36,7 @@ jobs:
3636
timeout-minutes: 60
3737
needs:
3838
- prepare
39-
runs-on: buildjet-2vcpu-ubuntu-2204
39+
runs-on: ubuntu-latest
4040
steps:
4141
- name: Checkout
4242
uses: actions/checkout@v4
@@ -102,11 +102,3 @@ jobs:
102102
echo '```yaml' >> report.md
103103
cat apisix-ingress-controller-conformance-report.yaml >> report.md
104104
echo '```' >> report.md
105-
106-
- name: Report Conformance Test Result to PR Comment
107-
if: ${{ github.event_name == 'pull_request' }}
108-
uses: mshick/add-pr-comment@v2
109-
with:
110-
message-id: 'apisix-conformance-test-report'
111-
message-path: |
112-
report.md

.github/workflows/apisix-e2e-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ concurrency:
1717
jobs:
1818
prepare:
1919
name: Prepare
20-
runs-on: buildjet-2vcpu-ubuntu-2204
20+
runs-on: ubuntu-latest
2121
steps:
2222
- name: Checkout
2323
uses: actions/checkout@v4
@@ -35,7 +35,7 @@ jobs:
3535
e2e-test:
3636
needs:
3737
- prepare
38-
runs-on: buildjet-2vcpu-ubuntu-2204
38+
runs-on: ubuntu-latest
3939
steps:
4040
- name: Checkout
4141
uses: actions/checkout@v4

.github/workflows/golangci-lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ on:
44
push:
55
branches:
66
- master
7-
- release-v2-dev
7+
- next
88
pull_request:
99
branches:
1010
- master
11-
- release-v2-dev
11+
- next
1212

1313
jobs:
1414
golangci:

.github/workflows/push-docker-v2-dev.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
workflow_dispatch:
99
jobs:
1010
docker:
11-
runs-on: buildjet-2vcpu-ubuntu-2204
11+
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
1414
uses: actions/checkout@v4
@@ -27,7 +27,7 @@ jobs:
2727
# uses: docker/setup-buildx-action@v3
2828

2929
- name: Login to Registry
30-
uses: docker/login-action@v1
30+
uses: docker/login-action@v3
3131
with:
3232
registry: ${{ secrets.DOCKER_REGISTRY }}
3333
username: ${{ secrets.DOCKER_USERNAME }}

.github/workflows/push-docker.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66

77
jobs:
88
docker:
9-
runs-on: buildjet-2vcpu-ubuntu-2204
9+
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout
1212
uses: actions/checkout@v4

.github/workflows/release-drafter.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ on:
2828
jobs:
2929
update_release_draft:
3030
if: github.repository == 'apache/apisix-ingress-controller'
31-
runs-on: buildjet-2vcpu-ubuntu-2204
31+
runs-on: ubuntu-latest
3232
steps:
3333
- name: Drafting release
3434
id: release_drafter

.github/workflows/spell-checker.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ on:
2121
push:
2222
branches:
2323
- master
24-
- release-v2-dev
24+
- next
2525
pull_request:
2626
branches:
2727
- master
28-
- release-v2-dev
28+
- next
2929
jobs:
3030
misspell:
3131
name: runner / misspell

.github/workflows/unit-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ on:
2222
push:
2323
branches:
2424
- master
25-
- release-v2-dev
25+
- next
2626
pull_request:
2727
branches:
2828
- master
29-
- release-v2-dev
29+
- next
3030
- 1.8.0
3131
jobs:
3232
run-test:
33-
runs-on: buildjet-2vcpu-ubuntu-2204
33+
runs-on: ubuntu-latest
3434
steps:
3535
- uses: actions/checkout@v4
3636
- name: Setup Go Env

0 commit comments

Comments
 (0)