Merge pull request #7012 from thaJeztah/update_golang_1.18.3
update golang to 1.18.3, 1.17.11
This commit is contained in:
		
							
								
								
									
										2
									
								
								.github/workflows/build-test-images.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/build-test-images.yml
									
									
									
									
										vendored
									
									
								
							| @@ -39,7 +39,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.18.2' |           go-version: '1.18.3' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|         with: |         with: | ||||||
|   | |||||||
							
								
								
									
										18
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										18
									
								
								.github/workflows/ci.yml
									
									
									
									
										vendored
									
									
								
							| @@ -20,7 +20,7 @@ jobs: | |||||||
|  |  | ||||||
|     strategy: |     strategy: | ||||||
|       matrix: |       matrix: | ||||||
|         go-version: [1.18.2] |         go-version: [1.18.3] | ||||||
|         os: [ubuntu-18.04, macos-10.15, windows-2019] |         os: [ubuntu-18.04, macos-10.15, windows-2019] | ||||||
|  |  | ||||||
|     steps: |     steps: | ||||||
| @@ -46,7 +46,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.18.2' |           go-version: '1.18.3' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|         with: |         with: | ||||||
| @@ -78,7 +78,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.18.2' |           go-version: '1.18.3' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|         with: |         with: | ||||||
| @@ -110,7 +110,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.18.2' |           go-version: '1.18.3' | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|       - run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1 |       - run: go install github.com/cpuguy83/go-md2man/v2@v2.0.1 | ||||||
|       - run: make man |       - run: make man | ||||||
| @@ -148,7 +148,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.18.2' |           go-version: '1.18.3' | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|       - run: | |       - run: | | ||||||
|           set -e -x |           set -e -x | ||||||
| @@ -215,7 +215,7 @@ jobs: | |||||||
|     strategy: |     strategy: | ||||||
|       matrix: |       matrix: | ||||||
|         os: [ubuntu-18.04, macos-10.15, windows-2019, windows-2022] |         os: [ubuntu-18.04, macos-10.15, windows-2019, windows-2022] | ||||||
|         go-version: ['1.17.10', '1.18.2'] |         go-version: ['1.17.11', '1.18.3'] | ||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
| @@ -261,7 +261,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.18.2' |           go-version: '1.18.3' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|         with: |         with: | ||||||
| @@ -389,7 +389,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.18.2' |           go-version: '1.18.3' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|  |  | ||||||
| @@ -508,7 +508,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.18.2' |           go-version: '1.18.3' | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|       - run: sudo -E PATH=$PATH script/setup/install-gotestsum |       - run: sudo -E PATH=$PATH script/setup/install-gotestsum | ||||||
|       - name: Tests |       - name: Tests | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								.github/workflows/codeql.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/codeql.yml
									
									
									
									
										vendored
									
									
								
							| @@ -26,7 +26,7 @@ jobs: | |||||||
|  |  | ||||||
|     - uses: actions/setup-go@v2 |     - uses: actions/setup-go@v2 | ||||||
|       with: |       with: | ||||||
|         go-version: 1.18.2 |         go-version: 1.18.3 | ||||||
|  |  | ||||||
|     # Initializes the CodeQL tools for scanning. |     # Initializes the CodeQL tools for scanning. | ||||||
|     - name: Initialize CodeQL |     - name: Initialize CodeQL | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								.github/workflows/images.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/images.yml
									
									
									
									
										vendored
									
									
								
							| @@ -24,7 +24,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.18.2' |           go-version: '1.18.3' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|         with: |         with: | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								.github/workflows/nightly.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/nightly.yml
									
									
									
									
										vendored
									
									
								
							| @@ -18,7 +18,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.18.2' |           go-version: '1.18.3' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|         with: |         with: | ||||||
| @@ -155,7 +155,7 @@ jobs: | |||||||
|     steps: |     steps: | ||||||
|       - uses: actions/setup-go@v2 |       - uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.18.2' |           go-version: '1.18.3' | ||||||
|  |  | ||||||
|       - uses: actions/checkout@v2 |       - uses: actions/checkout@v2 | ||||||
|         with: |         with: | ||||||
|   | |||||||
							
								
								
									
										4
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										4
									
								
								.github/workflows/release.yml
									
									
									
									
										vendored
									
									
								
							| @@ -66,7 +66,7 @@ jobs: | |||||||
|       - name: Install Go |       - name: Install Go | ||||||
|         uses: actions/setup-go@v2 |         uses: actions/setup-go@v2 | ||||||
|         with: |         with: | ||||||
|           go-version: '1.18.2' |           go-version: '1.18.3' | ||||||
|       - name: Set env |       - name: Set env | ||||||
|         shell: bash |         shell: bash | ||||||
|         env: |         env: | ||||||
| @@ -109,7 +109,7 @@ jobs: | |||||||
|           find ./releases/ -maxdepth 1 -type l | xargs rm |           find ./releases/ -maxdepth 1 -type l | xargs rm | ||||||
|         working-directory: src/github.com/containerd/containerd |         working-directory: src/github.com/containerd/containerd | ||||||
|         env: |         env: | ||||||
|           GO_VERSION: '1.18.2' |           GO_VERSION: '1.18.3' | ||||||
|           PLATFORM: ${{ matrix.platform }} |           PLATFORM: ${{ matrix.platform }} | ||||||
|       - name: Save Artifacts |       - name: Save Artifacts | ||||||
|         uses: actions/upload-artifact@v2 |         uses: actions/upload-artifact@v2 | ||||||
|   | |||||||
| @@ -2,7 +2,7 @@ | |||||||
|   become: yes |   become: yes | ||||||
|   roles: |   roles: | ||||||
|   - role: config-golang |   - role: config-golang | ||||||
|     go_version: '1.18.2' |     go_version: '1.18.3' | ||||||
|     arch: arm64 |     arch: arm64 | ||||||
|   tasks: |   tasks: | ||||||
|   - name: Install pre-requisites |   - name: Install pre-requisites | ||||||
|   | |||||||
| @@ -2,7 +2,7 @@ | |||||||
|   become: yes |   become: yes | ||||||
|   roles: |   roles: | ||||||
|   - role: config-golang |   - role: config-golang | ||||||
|     go_version: '1.18.2' |     go_version: '1.18.3' | ||||||
|     arch: arm64 |     arch: arm64 | ||||||
|   tasks: |   tasks: | ||||||
|   - name: Build containerd |   - name: Build containerd | ||||||
|   | |||||||
| @@ -2,7 +2,7 @@ | |||||||
|   become: yes |   become: yes | ||||||
|   roles: |   roles: | ||||||
|   - role: config-golang |   - role: config-golang | ||||||
|     go_version: '1.18.2' |     go_version: '1.18.3' | ||||||
|     arch: arm64 |     arch: arm64 | ||||||
|   tasks: |   tasks: | ||||||
|   - name: Build and test containerd |   - name: Build and test containerd | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								Vagrantfile
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								Vagrantfile
									
									
									
									
										vendored
									
									
								
							| @@ -97,7 +97,7 @@ EOF | |||||||
|   config.vm.provision "install-golang", type: "shell", run: "once" do |sh| |   config.vm.provision "install-golang", type: "shell", run: "once" do |sh| | ||||||
|     sh.upload_path = "/tmp/vagrant-install-golang" |     sh.upload_path = "/tmp/vagrant-install-golang" | ||||||
|     sh.env = { |     sh.env = { | ||||||
|         'GO_VERSION': ENV['GO_VERSION'] || "1.18.2", |         'GO_VERSION': ENV['GO_VERSION'] || "1.18.3", | ||||||
|     } |     } | ||||||
|     sh.inline = <<~SHELL |     sh.inline = <<~SHELL | ||||||
|         #!/usr/bin/env bash |         #!/usr/bin/env bash | ||||||
|   | |||||||
| @@ -10,7 +10,7 @@ | |||||||
| # | # | ||||||
| # docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../ | # docker build -t containerd-test --build-arg RUNC_VERSION=v1.0.0-rc94 -f Dockerfile.test ../ | ||||||
|  |  | ||||||
| ARG GOLANG_VERSION=1.18.2 | ARG GOLANG_VERSION=1.18.3 | ||||||
| ARG GOLANG_IMAGE=golang | ARG GOLANG_IMAGE=golang | ||||||
|  |  | ||||||
| FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang | FROM ${GOLANG_IMAGE}:${GOLANG_VERSION} AS golang | ||||||
|   | |||||||
| @@ -20,11 +20,11 @@ set -x | |||||||
|  |  | ||||||
| apt-get update && apt-get install -y wget | apt-get update && apt-get install -y wget | ||||||
| cd $SRC | cd $SRC | ||||||
| wget https://go.dev/dl/go1.18.2.linux-amd64.tar.gz | wget https://go.dev/dl/go1.18.3.linux-amd64.tar.gz | ||||||
|  |  | ||||||
| mkdir temp-go | mkdir temp-go | ||||||
| rm -rf /root/.go/* | rm -rf /root/.go/* | ||||||
| tar -C temp-go/ -xzf go1.18.2.linux-amd64.tar.gz | tar -C temp-go/ -xzf go1.18.3.linux-amd64.tar.gz | ||||||
| mv temp-go/go/* /root/.go/ | mv temp-go/go/* /root/.go/ | ||||||
| cd $SRC/containerd | cd $SRC/containerd | ||||||
|  |  | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Fu Wei
					Fu Wei