Skip to content

Commit 7aba185

Browse files
authored
Merge pull request #127 from Project-HAMi/fix_arm_ci
Update CI and fix arm-release
2 parents 58566f2 + afefcc2 commit 7aba185

2 files changed

Lines changed: 13 additions & 13 deletions

File tree

.github/workflows/release-image-build.yml

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,27 @@ jobs:
2424
build:
2525
runs-on: ubuntu-latest
2626
steps:
27-
- uses: actions/checkout@v2
28-
- uses: actions/setup-go@v2
27+
- uses: actions/checkout@v4
2928
with:
30-
go-version: "^1.19.x"
31-
- name: Checkout submodule
32-
uses: Mushus/checkout-submodule@v1.0.1
29+
submodules: true
30+
- name: Install Go
31+
uses: actions/setup-go@v5
3332
with:
34-
submodulePath: libvgpu
33+
go-version-file: go.mod
3534
- run: go version
36-
- name: Get branch name
37-
uses: nelonoel/branch-name@v1.0.1
35+
- name: Get tag name
36+
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
3837
- name: Docker Login
39-
uses: docker/login-action@v2.1.0
38+
uses: docker/login-action@v3
4039
with:
4140
username: ${{ secrets.DOCKERHUB_TOKEN }}
4241
password: ${{ secrets.DOCKERHUB_PASSWD }}
4342
- name: Set up Docker Buildx
4443
id: buildx
45-
uses: docker/setup-buildx-action@v1
44+
uses: docker/setup-buildx-action@v3
4645
- name: Generating image tag
4746
id: runtime-tag
4847
run: |
4948
echo tag="$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
50-
- run: BUILD_PLATFORMS="linux/amd64,linux/arm64" VERSION="${BRANCH_NAME}" make push-short
51-
- run: BUILD_PLATFORMS="linux/amd64,linux/arm64" VERSION="${BRANCH_NAME}-${{ steps.runtime-tag.outputs.tag }}" make push-latest
49+
- run: BUILD_PLATFORMS="linux/amd64,linux/arm64" VERSION="${RELEASE_VERSION}" make push-short
50+
- run: BUILD_PLATFORMS="linux/amd64,linux/arm64" VERSION="${RELEASE_VERSION}-${{ steps.runtime-tag.outputs.tag }}" make push-latest

docker/Dockerfile.ubuntu20.04

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@
1414

1515
FROM ubuntu:20.04 AS builder
1616
ARG TARGETARCH
17+
ARG GO_VERSION=1.25.5
1718
RUN apt-get update
1819
RUN apt-get -y install ca-certificates g++ wget
19-
RUN wget -qO- https://golang.google.cn/dl/go1.25.5.linux-amd64.tar.gz | tar -C /usr/local -zx
20+
RUN wget -qO- "https://go.dev/dl/go${GO_VERSION}.linux-${TARGETARCH}.tar.gz" | tar -C /usr/local -zx
2021
ENV GOPATH=/go
2122
ENV PATH=$GOPATH/bin:/usr/local/go/bin:$PATH
2223
WORKDIR /go/src/volcano.sh/devices

0 commit comments

Comments
 (0)