Skip to content

Commit 012f2cb

Browse files
authored
Merge pull request #20 from su2code/feature_tsan_3
Try workaround for image upload and disable tsan-enabled arm64
2 parents 5b55e60 + 3befd36 commit 012f2cb

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

.github/workflows/docker-image-upload.yml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
strategy:
5555
fail-fast: false
5656
matrix:
57-
platform: [amd64, arm64]
57+
platform: [amd64] # arm64
5858
steps:
5959
- name: Checkout
6060
uses: actions/checkout@v2
@@ -66,6 +66,9 @@ jobs:
6666

6767
- name: Set up Docker Buildx
6868
uses: docker/setup-buildx-action@v1
69+
with:
70+
buildkitd-flags: --debug
71+
driver-opts: image=moby/buildkit:v0.9.1
6972

7073
- name: Login to Github Docker Registry
7174
uses: docker/login-action@v1
@@ -99,7 +102,8 @@ jobs:
99102
run: docker buildx create --use
100103

101104
- name: Merge single-platform build-su2-tsan images
102-
run: docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/su2/build-su2-tsan:${{ needs.date-tag.outputs.date_tag }} ghcr.io/${{ github.repository_owner }}/su2/build-su2-tsan-amd64:${{ needs.date-tag.outputs.date_tag }} ghcr.io/${{ github.repository_owner }}/su2/build-su2-tsan-arm64:${{ needs.date-tag.outputs.date_tag }}
105+
run: docker buildx imagetools create -t ghcr.io/${{ github.repository_owner }}/su2/build-su2-tsan:${{ needs.date-tag.outputs.date_tag }} ghcr.io/${{ github.repository_owner }}/su2/build-su2-tsan-amd64:${{ needs.date-tag.outputs.date_tag }}
106+
# ghcr.io/${{ github.repository_owner }}/su2/build-su2-tsan-arm64:${{ needs.date-tag.outputs.date_tag }}
103107

104108
test-su2:
105109
needs: [date-tag, build-su2, build-su2-tsan]
@@ -131,7 +135,8 @@ jobs:
131135
run: docker buildx build --platform=linux/amd64 --platform=linux/arm64 --build-arg BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/su2/build-su2:${{ needs.date-tag.outputs.date_tag }} -t ghcr.io/${{ github.repository_owner }}/su2/test-su2:${{ needs.date-tag.outputs.date_tag }} --push ./test/
132136

133137
- name: Build and push test-su2-tsan
134-
run: docker buildx build --platform=linux/amd64 --platform=linux/arm64 --build-arg BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/su2/build-su2-tsan:${{ needs.date-tag.outputs.date_tag }} -t ghcr.io/${{ github.repository_owner }}/su2/test-su2-tsan:${{ needs.date-tag.outputs.date_tag }} --push ./test/
138+
run: docker buildx build --platform=linux/amd64 --build-arg BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/su2/build-su2-tsan:${{ needs.date-tag.outputs.date_tag }} -t ghcr.io/${{ github.repository_owner }}/su2/test-su2-tsan:${{ needs.date-tag.outputs.date_tag }} --push ./test/
139+
# --platform=linux/arm64
135140

136141
cross-build-su2-mac:
137142
needs: [date-tag, build-su2]
@@ -163,7 +168,7 @@ jobs:
163168
run: docker buildx build --platform=linux/amd64 --platform=linux/arm64 --build-arg BASE_IMAGE=ghcr.io/${{ github.repository_owner }}/su2/build-su2:${{ needs.date-tag.outputs.date_tag }} -t ghcr.io/${{ github.repository_owner }}/su2/build-su2-cross-stage1:${{ needs.date-tag.outputs.date_tag }} --push --file ./build_cross/Dockerfile.stage1 ./build_cross/
164169

165170
cross-build-su2-linux:
166-
needs: [build-su2, cross-build-su2-mac]
171+
needs: [date-tag, build-su2, cross-build-su2-mac]
167172
if: ${{ always() && !(contains(needs.*.result, 'failure')) }}
168173
runs-on: ubuntu-latest
169174
steps:

0 commit comments

Comments
 (0)