Skip to content

Commit

Permalink
powerpc/ci: Update CI
Browse files Browse the repository at this point in the history
  • Loading branch information
mpe committed Sep 19, 2024
1 parent 72a0191 commit e7d9368
Show file tree
Hide file tree
Showing 9 changed files with 191 additions and 75 deletions.
44 changes: 23 additions & 21 deletions .github/workflows/powerpc-allconfig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,38 @@ jobs:
kernel:
runs-on: ubuntu-latest

continue-on-error: true

strategy:
fail-fast: false
matrix:
include:
# ppc64le allmod and allyes
- subarch: ppc64le
defconfig: ppc64le_allmodconfig
image: ubuntu-21.10
image: fedora-40
- subarch: ppc64le
defconfig: allmodconfig
image: ubuntu-21.10
defconfig: allyesconfig
image: fedora-40
merge_config: /linux/arch/powerpc/configs/le.config
# ppc64 allmod and allyes
- subarch: ppc64
defconfig: allmodconfig
image: ubuntu-21.10
image: fedora-40
- subarch: ppc64
defconfig: allyesconfig
image: ubuntu-21.10
image: fedora-40
# ppc32 allmod
- subarch: ppc
defconfig: ppc32_allmodconfig
image: ubuntu-21.10
image: fedora-40
# ppc64 book3e allmod
- subarch: ppc64
defconfig: ppc64_book3e_allmodconfig
image: ubuntu-21.10
image: fedora-40

env:
ARCH: powerpc
TARGET: kernel
CCACHE: 1
SUBARCH: ${{ matrix.subarch }}
IMAGE: ${{ matrix.image }}
DEFCONFIG: ${{ matrix.defconfig }}
Expand All @@ -60,17 +59,20 @@ jobs:
echo "::add-matcher::.github/problem-matchers/compiler-source.json"
echo "::add-matcher::.github/problem-matchers/compiler-non-source.json"
- name: build
run: ./arch/powerpc/tools/ci-build.sh
- name: Load ccache
uses: actions/cache@v4
with:
path: ~/.ccache
key: ${{ matrix.image }}-${{ matrix.subarch }}-${{ matrix.defconfig }}

- name: Archive artifacts
uses: actions/upload-artifact@v4
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
name: ${{ matrix.defconfig }}-${{ matrix.image }}
path: |
~/output/vmlinux
~/output/.config
~/output/System.map
~/output/modules.tar.bz2
~/output/arch/powerpc/boot/zImage
~/output/arch/powerpc/boot/uImage
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build
run: |
mkdir -p ~/.ccache
./arch/powerpc/tools/ci-build.sh
24 changes: 20 additions & 4 deletions .github/workflows/powerpc-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,19 @@ jobs:
fail-fast: false
matrix:
defconfig: [ppc64, corenet64_smp, pmac32, ppc40x, ppc44x, mpc885_ads]
image: [ubuntu-21.10]
image: [fedora-40]
subarch: [ppc64]
include:
- subarch: ppc64le
defconfig: ppc64le
image: ubuntu-21.10
image: fedora-40

env:
CLANG: 1
LLVM_IAS: 0
ARCH: powerpc
TARGET: kernel
CCACHE: 1
SUBARCH: ${{ matrix.subarch }}
IMAGE: ${{ matrix.image }}
DEFCONFIG: ${{ matrix.defconfig }}
Expand All @@ -52,8 +53,23 @@ jobs:
echo "::add-matcher::.github/problem-matchers/compiler-source.json"
echo "::add-matcher::.github/problem-matchers/compiler-non-source.json"
- name: build
run: ./arch/powerpc/tools/ci-build.sh
- name: Load ccache
uses: actions/cache@v4
with:
path: ~/.ccache
key: ${{ matrix.image }}-${{ matrix.subarch }}-${{ matrix.defconfig }}

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build
run: |
mkdir -p ~/.ccache
./arch/powerpc/tools/ci-build.sh
- name: Archive artifacts
uses: actions/upload-artifact@v4
Expand Down
24 changes: 20 additions & 4 deletions .github/workflows/powerpc-extrawarn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,20 @@ jobs:
strategy:
matrix:
defconfig: [ppc64, corenet64_smp, pmac32, ppc40x, ppc44x, mpc885_ads, corenet32_smp]
image: [fedora-33, korg-4.9.4]
image: [fedora-40, korg-5.5.0]
subarch: [ppc64]
include:
- subarch: ppc64le
defconfig: ppc64le
image: korg-5.5.0
- subarch: ppc64le
defconfig: ppc64le
image: fedora-33
image: fedora-40

env:
ARCH: powerpc
TARGET: kernel
CCACHE: 1
SUBARCH: ${{ matrix.subarch }}
IMAGE: ${{ matrix.image }}
DEFCONFIG: ${{ matrix.defconfig }}
Expand All @@ -39,8 +40,23 @@ jobs:
echo "::add-matcher::.github/problem-matchers/compiler-source.json"
echo "::add-matcher::.github/problem-matchers/compiler-non-source.json"
- name: build
run: ./arch/powerpc/tools/ci-build.sh
- name: Load ccache
uses: actions/cache@v4
with:
path: ~/.ccache
key: ${{ matrix.image }}-${{ matrix.subarch }}-${{ matrix.defconfig }}

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build
run: |
mkdir -p ~/.ccache
./arch/powerpc/tools/ci-build.sh
- name: Archive artifacts
uses: actions/upload-artifact@v4
Expand Down
70 changes: 45 additions & 25 deletions .github/workflows/powerpc-kernel+qemu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,62 +26,55 @@ jobs:
strategy:
matrix:
defconfig: [ppc64_defconfig, ppc40x_defconfig, mpc885_ads_defconfig]
image: [fedora-34, korg-5.5.0]
image: [fedora-40, korg-5.5.0]
include:
# ppc64le
- defconfig: ppc64le_defconfig
image: korg-5.5.0
subarch: ppc64le
- defconfig: ppc64le_defconfig
image: fedora-34
subarch: ppc64le

# ppc64le_guest_defconfig
- subarch: ppc64le
defconfig: ppc64le_guest_defconfig
image: fedora-34
image: fedora-40
- subarch: ppc64le
defconfig: ppc64le_guest_defconfig
image: korg-5.5.0

# ppc44x
- defconfig: ppc44x_defconfig
merge_config: /linux/arch/powerpc/configs/ppc44x-qemu.config
image: fedora-34
image: fedora-40
- defconfig: ppc44x_defconfig
merge_config: /linux/arch/powerpc/configs/ppc44x-qemu.config
image: korg-5.5.0

# corenet64_smp
- defconfig: corenet64_smp_defconfig
merge_config: /linux/arch/powerpc/configs/ppc64e-qemu.config
image: fedora-34
image: fedora-40
- defconfig: corenet64_smp_defconfig
merge_config: /linux/arch/powerpc/configs/ppc64e-qemu.config
image: korg-5.5.0

# g5
- defconfig: g5_defconfig
merge_config: /linux/arch/powerpc/configs/g5-qemu.config
image: fedora-34
image: fedora-40
- defconfig: g5_defconfig
merge_config: /linux/arch/powerpc/configs/g5-qemu.config
image: korg-5.5.0

# pmac32
- defconfig: pmac32_defconfig
merge_config: /linux/arch/powerpc/configs/pmac32-qemu.config
image: fedora-34
image: fedora-40
- defconfig: pmac32_defconfig
merge_config: /linux/arch/powerpc/configs/pmac32-qemu.config
image: korg-5.5.0

- defconfig: corenet32_smp_defconfig
image: fedora-34
image: fedora-40

env:
ARCH: powerpc
TARGET: kernel
CCACHE: 1
SUBARCH: ${{ matrix.subarch }}
IMAGE: ${{ matrix.image }}
DEFCONFIG: ${{ matrix.defconfig }}
Expand All @@ -95,8 +88,23 @@ jobs:
echo "::add-matcher::.github/problem-matchers/compiler-source.json"
echo "::add-matcher::.github/problem-matchers/compiler-non-source.json"
- name: build
run: ./arch/powerpc/tools/ci-build.sh
- name: Load ccache
uses: actions/cache@v4
with:
path: ~/.ccache
key: ${{ matrix.image }}-${{ matrix.subarch }}-${{ matrix.defconfig }}

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build
run: |
mkdir -p ~/.ccache
./arch/powerpc/tools/ci-build.sh
- name: Archive artifacts
uses: actions/upload-artifact@v4
Expand Down Expand Up @@ -124,48 +132,60 @@ jobs:
packages: qemu-system-ppc64
rootfs: ppc64le-rootfs.cpio.gz
old-image: korg-5.5.0
new-image: fedora-34
new-image: fedora-40

- defconfig: ppc64le_guest_defconfig
machine: powernv+p8+tcg
machine_2: powernv+p9+tcg
packages: qemu-system-ppc64
rootfs: ppc64le-rootfs.cpio.gz
old-image: korg-5.5.0
new-image: fedora-40

- defconfig: ppc44x_defconfig
machine: 44x
packages: qemu-system-ppc
rootfs: ppc-rootfs.cpio.gz
old-image: korg-5.5.0
new-image: fedora-34
new-image: fedora-40

- defconfig: corenet64_smp_defconfig
machine: ppc64e
machine_2: ppc64e+compat
packages: qemu-system-ppc64
rootfs: ppc64-novsx-rootfs.cpio.gz ppc-rootfs.cpio.gz
old-image: korg-5.5.0
new-image: fedora-34
new-image: fedora-40

- defconfig: g5_defconfig
machine: g5
packages: qemu-system-ppc64 openbios-ppc
rootfs: ppc64-rootfs.cpio.gz
old-image: korg-5.5.0
new-image: fedora-34
new-image: fedora-40

- defconfig: pmac32_defconfig
machine: mac99
packages: qemu-system-ppc openbios-ppc
rootfs: ppc-rootfs.cpio.gz
old-image: korg-5.5.0
new-image: fedora-34
new-image: fedora-40

steps:
- uses: actions/checkout@v4
with:
repository: linuxppc/ci-scripts

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Download root disk
run: make -C root-disks ${{ matrix.rootfs }}

- name: Set root disk path
run: echo "ROOT_DISK_PATH=$PWD/root-disks" >> $GITHUB_ENV

- name: APT update
run: sudo apt update

Expand Down
24 changes: 21 additions & 3 deletions .github/workflows/powerpc-perf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,22 @@ on:
- 'tools/include/**'
- 'tools/lib/**'
- 'tools/scripts/**'
# Change to workflow triggers a build
- '.github/workflows/powerpc-perf.yml'

jobs:
perf:
runs-on: ubuntu-latest

strategy:
matrix:
image: [ubuntu-21.10, ubuntu-21.04, ubuntu-20.04, ubuntu-18.04, ubuntu-16.04]
image: [ubuntu-22.04, ubuntu-20.04, ubuntu-18.04]
subarch: [ppc64, ppc64le]

env:
ARCH: powerpc
TARGET: perf
CCACHE: 1
SUBARCH: ${{ matrix.subarch }}
IMAGE: ${{ matrix.image }}

Expand All @@ -42,8 +45,23 @@ jobs:
echo "::add-matcher::.github/problem-matchers/compiler-source.json"
echo "::add-matcher::.github/problem-matchers/compiler-non-source.json"
- name: build
run: ./arch/powerpc/tools/ci-build.sh
- name: Load ccache
uses: actions/cache@v4
with:
path: ~/.ccache
key: ${{ matrix.image }}-${{ matrix.subarch }}-${{ matrix.defconfig }}

- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build
run: |
mkdir -p ~/.ccache
./arch/powerpc/tools/ci-build.sh
- name: Archive artifacts
uses: actions/upload-artifact@v4
Expand Down
Loading

0 comments on commit e7d9368

Please sign in to comment.