Skip to content

Commit 21561ad

Browse files
committed
Update GitHub CI
1 parent 8dd6cce commit 21561ad

File tree

3 files changed

+34
-40
lines changed

3 files changed

+34
-40
lines changed

.github/workflows/buildroot-experimental.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: Buildroot experimental
2-
on: [workflow_dispatch]
2+
on:
3+
workflow_dispatch:
34
jobs:
45

56
build-riscv64:

.github/workflows/buildroot-host.yml

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
name: Buildroot Host
2-
on: [workflow_dispatch]
2+
on:
3+
workflow_dispatch:
34
jobs:
4-
build-toolchain:
5-
name: Build Toolchain for Buildroot
5+
build:
6+
name: Build from scratch
67
strategy:
78
matrix:
89
config: ["arm64", "armv7", "armv6", "armv5", "x86_64", "i386", "ppc64le"]
@@ -17,13 +18,8 @@ jobs:
1718
run: |
1819
export SWIFT_BUILDROOT=$GITHUB_WORKSPACE
1920
export SWIFT_TARGET_ARCH=${{ matrix.config }}
20-
tar -xvf ./host-tools.tar.gz
2121
$SWIFT_BUILDROOT/.devcontainer/build-scripts/download-buildroot.sh
22-
$SWIFT_BUILDROOT/.devcontainer/build-scripts/configure.sh
23-
$SWIFT_BUILDROOT/.devcontainer/build-scripts/fetch-sources.sh
24-
$SWIFT_BUILDROOT/.devcontainer/build-scripts/build-host-tools.sh
25-
$SWIFT_BUILDROOT/.devcontainer/build-scripts/build-host-swift.sh
26-
$SWIFT_BUILDROOT/.devcontainer/build-scripts/build-toolchain.sh
22+
$SWIFT_BUILDROOT/.devcontainer/build-scripts/build.sh
2723
- name: Archive Build artifacts
2824
uses: actions/upload-artifact@v3
2925
with:

.github/workflows/docker.yml

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,28 @@
1-
name: Publish Docker image
2-
3-
on: [workflow_dispatch]
4-
1+
name: Docker
2+
on:
3+
workflow_dispatch:
54
jobs:
6-
push_to_registry:
7-
name: Push Docker image to Docker Hub
8-
runs-on: ubuntu-latest
9-
permissions:
10-
packages: write
11-
contents: read
12-
attestations: write
13-
id-token: write
14-
steps:
15-
- name: Check out the repo
16-
uses: actions/checkout@v4
17-
18-
- name: Log in to Docker Hub
19-
uses: docker/login-action@f4ef78c080cd8ba55a85445d5b36e214a81df20a
20-
with:
21-
username: ${{ secrets.DOCKER_USERNAME }}
22-
password: ${{ secrets.DOCKER_PASSWORD }}
23-
24-
- name: Build and push Docker image
25-
id: push
26-
uses: docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
27-
with:
28-
context: .devcontainer
29-
file: ./.devcontainer/Dockerfile
30-
push: true
31-
tags: latest
5+
publish:
6+
name: Build and Publish Docker image
7+
strategy:
8+
matrix:
9+
arch: ["arm64", "armv7", "armv6", "armv5", "x86_64", "i386", "ppc64le"]
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout
13+
uses: actions/checkout@v3
14+
- name: Authenticate Docker
15+
uses: docker/[email protected]
16+
with:
17+
username: ${{ secrets.DOCKER_USERNAME }}
18+
password: ${{ secrets.DOCKER_PASSWORD }}
19+
- name: Build
20+
run: |
21+
export SWIFT_BUILDROOT=$GITHUB_WORKSPACE
22+
export SWIFT_TARGET_ARCH=${{ matrix.arch }}
23+
$SWIFT_BUILDROOT/.devcontainer/build-scripts/build-docker.sh
24+
- name: Archive Build artifacts
25+
uses: actions/upload-artifact@v3
26+
with:
27+
name: build-${{ matrix.arch }}
28+
path: ./output/${{ matrix.arch }}/images

0 commit comments

Comments
 (0)