Skip to content

Commit

Permalink
Update Readme, remove some fedora defaults
Browse files Browse the repository at this point in the history
  • Loading branch information
uraimo committed Jan 27, 2024
1 parent 427b1ab commit 18a5cd7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 19 deletions.
4 changes: 0 additions & 4 deletions Dockerfiles/Dockerfile.ppc64le.fedora_latest

This file was deleted.

4 changes: 0 additions & 4 deletions Dockerfiles/Dockerfile.s390x.fedora_latest

This file was deleted.

22 changes: 11 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ A GitHub Action that executes commands on non-x86 CPU architecture (armv6, armv7
This action requires three input parameters:

* `arch`: CPU architecture: `armv6`, `armv7`, `aarch64`, `riscv64`, `s390x`, or `ppc64le`. See [Supported Platforms](#supported-platforms) for the full matrix.
* `distro`: Linux distribution name: `ubuntu16.04`, `ubuntu18.04`, `ubuntu20.04`, `bullseye`, `buster`, `stretch`, `jessie`, `fedora_latest`, `alpine_latest` or `archarm_latest`. See [Supported Platforms](#supported-platforms) for the full matrix.
* `distro`: Linux distribution name: `ubuntu20.04`, `bullseye`, `buster`, `stretch`, `fedora_latest`, `alpine_latest` or `archarm_latest`. See [Supported Platforms](#supported-platforms) for the full matrix.
* `run`: Shell commands to execute in the container.

The action also accepts some optional input parameters:
Expand All @@ -33,15 +33,15 @@ jobs:
armv7_job:
# The host should always be Linux
runs-on: ubuntu-22.04
name: Build on ubuntu-18.04 armv7
name: Build on ubuntu-22.04 armv7
steps:
- uses: actions/checkout@v4
- uses: uraimo/run-on-arch-action@v2
name: Run commands
id: runcmd
with:
arch: armv7
distro: ubuntu18.04
distro: ubuntu22.04

# Not required, but speeds up builds by storing container images in
# a GitHub package registry.
Expand Down Expand Up @@ -76,11 +76,11 @@ jobs:
matrix:
include:
- arch: aarch64
distro: ubuntu18.04
distro: ubuntu22.04
- arch: aarch64
distro: bullseye
- arch: ppc64le
distro: alpine_latest
- arch: s390x
distro: fedora_latest
- arch: none
distro: none
base_image: riscv64/busybox
Expand Down Expand Up @@ -152,12 +152,12 @@ This table details the valid `arch`/`distro` combinations:

| arch | distro |
| -------- | ---------- |
| armv6 | jessie, stretch, buster, bullseye, alpine_latest |
| armv7 | jessie, stretch, buster, bullseye, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04, ubuntu_latest, ubuntu_rolling, ubuntu_devel, fedora_latest, alpine_latest, archarm_latest |
| aarch64 | stretch, buster, bullseye, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04, ubuntu_latest, ubuntu_rolling, ubuntu_devel, fedora_latest, alpine_latest, archarm_latest |
| armv6 | stretch, buster, bullseye, alpine_latest |
| armv7 | stretch, buster, bullseye, ubuntu20.04, ubuntu22.04, ubuntu_latest, ubuntu_rolling, ubuntu_devel, fedora_latest, alpine_latest, archarm_latest |
| aarch64 | stretch, buster, bullseye, ubuntu20.04, ubuntu22.04, ubuntu_latest, ubuntu_rolling, ubuntu_devel, fedora_latest, alpine_latest, archarm_latest |
| riscv64 | ubuntu20.04, ubuntu22.04, ubuntu_latest, ubuntu_rolling, ubuntu_devel, alpine_edge |
| s390x | jessie, stretch, buster, bullseye, ubuntu16.04, ubuntu18.04, ubuntu20.04, ubuntu22.04, ubuntu_latest, ubuntu_rolling, ubuntu_devel, fedora_latest, alpine_latest |
| ppc64le | jessie, stretch, buster, bullseye, ubuntu16.04, ubuntu18.04,ubuntu20.04, ubuntu22.04, ubuntu_latest, ubuntu_rolling, ubuntu_devel, fedora_latest, alpine_latest |
| s390x | stretch, buster, bullseye, ubuntu20.04, ubuntu22.04, ubuntu_latest, ubuntu_rolling, ubuntu_devel, alpine_latest |
| ppc64le | stretch, buster, bullseye, ubuntu20.04, ubuntu22.04, ubuntu_latest, ubuntu_rolling, ubuntu_devel, alpine_latest |


Using an invalid `arch`/`distro` combination will fail.
Expand Down

0 comments on commit 18a5cd7

Please sign in to comment.