Skip to content

Commit

Permalink
Bump up the Ubuntu and controller-gen versions to be consistent with …
Browse files Browse the repository at this point in the history
…KubeEdge

Signed-off-by: WillardHu <[email protected]>
  • Loading branch information
WillardHu committed Feb 7, 2025
1 parent 86cf2b8 commit 67f623b
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
verify-and-lint:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: Verify codegen/vendor/licenses, do lint
env:
GOPATH: ${{ github.workspace }}
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
working-directory: ${{ env.CODE_DIR }}

build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: build gm and lc
steps:
- name: Install Go
Expand All @@ -72,7 +72,7 @@ jobs:
- run: make build # without verify

basic_test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: 'Unit test, integration test edge (noop now)'
steps:
- name: Install Go
Expand All @@ -96,7 +96,7 @@ jobs:
- run: ': to be added'

e2e_test:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: 'E2e test'
steps:
- name: Install Go
Expand Down Expand Up @@ -131,7 +131,7 @@ jobs:
- run: make e2e

docker_build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: docker image build for gm/lc
steps:
- name: Install Go
Expand All @@ -152,7 +152,7 @@ jobs:
- run: make images

docker_cross_build:
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
name: docker cross build images for gm/lc/kb
steps:
- name: Install Go
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ ifeq (, $(shell which controller-gen))
CONTROLLER_GEN_TMP_DIR=$$(mktemp -d) ;\
cd $$CONTROLLER_GEN_TMP_DIR ;\
go mod init tmp ;\
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.4.1 ;\
go get sigs.k8s.io/controller-tools/cmd/controller-gen@v0.15.0 ;\
rm -rf $$CONTROLLER_GEN_TMP_DIR ;\
}
CONTROLLER_GEN=$(GOBIN)/controller-gen
Expand Down

0 comments on commit 67f623b

Please sign in to comment.