Skip to content

Commit 2231aed

Browse files
committed
fix cicd, step 35
1 parent cc989be commit 2231aed

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

.github/workflows/client_build.yml

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -8,48 +8,48 @@ on:
88
env:
99
REGISTRY: ghcr.io
1010
jobs:
11-
# docker:
12-
# runs-on: ubuntu-latest
13-
# steps:
14-
# - uses: actions/checkout@v3
15-
# with:
16-
# submodules: true
17-
# -
18-
# name: Set up Docker Buildx
19-
# uses: docker/setup-buildx-action@v2
20-
# -
21-
# name: Login to GithubPackages
22-
# uses: docker/login-action@v2
23-
# with:
24-
# registry: ${{ env.REGISTRY }}
25-
# username: ${{ github.actor }}
26-
# password: ${{ secrets.GITHUB_TOKEN }}
27-
# -
28-
# name: build and push docker image
29-
# uses: docker/build-push-action@v2
30-
# with:
31-
# context: .
32-
# #platforms: linux/amd64,linux/arm64
33-
# push: true
34-
# file: command/docker/client/client.Dockerfile
35-
# cache-from: type=gha
36-
# cache-to: type=gha,mode=max
37-
# tags: ${{ env.REGISTRY }}/fornetcode/fornet:${{github.event.inputs.version}}
11+
docker:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v3
15+
with:
16+
submodules: true
17+
-
18+
name: Set up Docker Buildx
19+
uses: docker/setup-buildx-action@v2
20+
-
21+
name: Login to GithubPackages
22+
uses: docker/login-action@v2
23+
with:
24+
registry: ${{ env.REGISTRY }}
25+
username: ${{ github.actor }}
26+
password: ${{ secrets.GITHUB_TOKEN }}
27+
-
28+
name: build and push docker image
29+
uses: docker/build-push-action@v2
30+
with:
31+
context: .
32+
#platforms: linux/amd64,linux/arm64
33+
push: true
34+
file: command/docker/client/client.Dockerfile
35+
cache-from: type=gha
36+
cache-to: type=gha,mode=max
37+
tags: ${{ env.REGISTRY }}/fornetcode/fornet:${{github.event.inputs.version}}
3838
commandLine:
3939
strategy:
4040
max-parallel: 1
4141
fail-fast: true
4242
matrix:
4343
settings:
44-
# - host: ubuntu-latest
45-
# target: x86_64-unknown-linux-gnu
46-
# build: make release-linux
44+
- host: ubuntu-latest
45+
target: x86_64-unknown-linux-gnu
46+
build: make release-linux
4747
- host: macos-latest
4848
target: x86_64-apple-darwin
4949
build: make release-mac-x86_64
50-
- host: macos-latest
51-
target: aarch64-apple-darwin
52-
build: make release-mac-aarch64
50+
# - host: macos-latest # This needs aarch64 OpenSSL, will wait github action support MacOS M1(https://github.com/github/roadmap/issues/528), then run this.
51+
# target: aarch64-apple-darwin
52+
# build: make release-mac-aarch64
5353
runs-on: ${{ matrix.settings.host }}
5454
steps:
5555
- uses: actions/checkout@v3

0 commit comments

Comments
 (0)