diff --git a/.github/workflows/fedora-ci.yml b/.github/workflows/fedora-ci.yml index 96ec018..b22795c 100644 --- a/.github/workflows/fedora-ci.yml +++ b/.github/workflows/fedora-ci.yml @@ -2,7 +2,7 @@ name: Build image 'fedora-ci' on: push: branches: - - main + - f40 paths: - 'fedora-ci/*' jobs: @@ -10,6 +10,6 @@ jobs: uses: ./.github/workflows/build-image.yml with: image_name: "fedora-ci" - tags: unstable - publish: ${{ github.ref == 'refs/heads/main' }} - branch: main + tags: 40 + publish: ${{ github.ref == 'refs/heads/f40' }} + branch: f40 diff --git a/.github/workflows/fedora-silverblue.yml b/.github/workflows/fedora-silverblue.yml deleted file mode 100644 index 7e6bb89..0000000 --- a/.github/workflows/fedora-silverblue.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Build image 'fedora-silverblue' -on: - push: - branches: - - main - paths: - - 'fedora-silverblue/*' -jobs: - build-image: - uses: ./.github/workflows/build-image.yml - with: - image_name: "fedora-silverblue" - tags: unstable - publish: ${{ github.ref == 'refs/heads/main' }} - branch: main diff --git a/.github/workflows/nightly-update.yml b/.github/workflows/nightly-update.yml deleted file mode 100644 index 7dfc179..0000000 --- a/.github/workflows/nightly-update.yml +++ /dev/null @@ -1,46 +0,0 @@ -name: Update all images -on: - schedule: - # Every day at 2:49 AM - - cron: "49 2 * * *" - -jobs: - fedora-ci-40: - uses: ./.github/workflows/build-image.yml - with: - image_name: "fedora-ci" - tags: "40" - publish: true - branch: f40 - - fedora-ci-41: - uses: ./.github/workflows/build-image.yml - with: - image_name: "fedora-ci" - tags: '41' - publish: true - branch: f41 - - fedora-silverblue-41: - uses: ./.github/workflows/build-image.yml - with: - image_name: "fedora-silverblue" - tags: '41' - publish: true - branch: f41 - - fedora-ci-unstable: - uses: ./.github/workflows/build-image.yml - with: - image_name: "fedora-ci" - tags: unstable - publish: true - branch: main - - fedora-silverblue-unstable: - uses: ./.github/workflows/build-image.yml - with: - image_name: "fedora-silverblue" - tags: unstable - publish: true - branch: main diff --git a/fedora-ci/Containerfile b/fedora-ci/Containerfile index 38830b3..784da87 100644 --- a/fedora-ci/Containerfile +++ b/fedora-ci/Containerfile @@ -1,4 +1,4 @@ -FROM fedora:41 +FROM fedora:40 SHELL ["/usr/bin/bash", "-c"] RUN dnf install --quiet -y \ diff --git a/fedora-silverblue/Containerfile b/fedora-silverblue/Containerfile deleted file mode 100644 index 239b3f2..0000000 --- a/fedora-silverblue/Containerfile +++ /dev/null @@ -1,10 +0,0 @@ -FROM quay.io/fedora/fedora-silverblue:41 - -COPY copr-sharpenedblade-t2linux.repo /etc/yum.repos.d/ - -RUN rpm-ostree override replace --experimental --freeze \ - --from repo="copr:copr.fedorainfracloud.org:sharpenedblade:t2linux" \ - kernel kernel-core kernel-modules kernel-modules-core kernel-modules-extra && \ - rpm-ostree install t2linux-repos t2linux-release && \ - rpm-ostree install bootc dnf5 && \ - ostree container commit diff --git a/fedora-silverblue/copr-sharpenedblade-t2linux.repo b/fedora-silverblue/copr-sharpenedblade-t2linux.repo deleted file mode 100644 index 25cfd53..0000000 --- a/fedora-silverblue/copr-sharpenedblade-t2linux.repo +++ /dev/null @@ -1,11 +0,0 @@ -[copr:copr.fedorainfracloud.org:sharpenedblade:t2linux] -name=Copr repo for t2linux owned by sharpenedblade -baseurl=https://download.copr.fedorainfracloud.org/results/sharpenedblade/t2linux/fedora-$releasever-$basearch/ -type=rpm-md -skip_if_unavailable=True -gpgcheck=1 -gpgkey=https://download.copr.fedorainfracloud.org/results/sharpenedblade/t2linux/pubkey.gpg -repo_gpgcheck=0 -enabled=1 -enabled_metadata=1 -priority=80