Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: os update #157

Merged
merged 2 commits into from
Jun 13, 2024
Merged

ci: os update #157

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a8f3ef
ci: os update
crazy-max May 27, 2024
f4f4003
xx-apk: riscv64 supported since alpine 3.20
crazy-max May 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ jobs:
fail-fast: false
matrix:
include:
-
image: alpine:3.15
typ: alpine
allow-failure: false
-
image: alpine:3.16
typ: alpine
Expand All @@ -56,12 +52,12 @@ jobs:
typ: alpine
allow-failure: false
-
image: alpine:edge
image: alpine:3.20
typ: alpine
allow-failure: true
allow-failure: false
-
image: debian:buster-backports
typ: debian
Comment on lines -63 to -64
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

removed buster-backports as buster is EOL for a long time now but still keeps logic in the code base.

image: alpine:edge
typ: alpine
allow-failure: true
-
image: debian:bullseye-backports
Expand Down Expand Up @@ -104,15 +100,19 @@ jobs:
typ: rhel
allow-failure: false
-
image: fedora:37
image: fedora:38
typ: rhel
allow-failure: false
-
image: fedora:38
image: fedora:39
typ: rhel
allow-failure: false
-
image: fedora:39
image: fedora:40
typ: rhel
allow-failure: false
-
image: fedora:41
typ: rhel
allow-failure: false
-
Expand Down
12 changes: 8 additions & 4 deletions src/xx-apk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ setup() {

cp /etc/apk/repositories "$apk_dir/"

# riscv only supported in edge atm
if [ "$TARGETARCH" = "riscv64" ]; then
echo "https://dl-cdn.alpinelinux.org/alpine/edge/main" >"$apk_dir/repositories"
echo "https://dl-cdn.alpinelinux.org/alpine/edge/community" >>"$apk_dir/repositories"
# riscv supported since alpine 3.20
if [ "$TARGETARCH" = "riscv64" ] && ! supportRiscV; then
crazy-max marked this conversation as resolved.
Show resolved Hide resolved
echo "https://dl-cdn.alpinelinux.org/alpine/v3.20/main" >"$apk_dir/repositories"
echo "https://dl-cdn.alpinelinux.org/alpine/v3.20/community" >>"$apk_dir/repositories"
fi
mkdir "$apk_dir/keys"
mkdir "$apk_dir/protected_paths.d"
Expand Down Expand Up @@ -132,6 +132,10 @@ cmd() {
fi
}

supportRiscV() {
versionGTE "$(xx-info os-version | cut -d'.' -f1-2)" "3.20"
}

case "$1" in
"setup")
setup
Expand Down