From bf9d9d2c86a05ce477391e7cd4417335dbb2fe2a Mon Sep 17 00:00:00 2001 From: Benjamin Sherman Date: Fri, 31 Mar 2023 17:13:48 -0500 Subject: [PATCH] chore: reorganize build to prepare for future changes (#9) * chore: move build build files to main subdirectory Prepare for future build changes by moving all existing build files to a `main` subdirectory and verifying workflow handles this. * chore: build approx 1 hour after upstream images It seems upstream CoreOS images publish around 10:20pm. https://quay.io/repository/fedora/fedora-coreos?tab=tags&tag=latest --- .github/workflows/build.yml | 5 +++-- Containerfile => main/Containerfile | 0 build.sh => main/build.sh | 0 {etc => main/etc}/default/duperemove | 0 {etc => main/etc}/sysctl.conf | 0 {etc => main/etc}/systemd/system/cockpit.service | 0 {etc => main/etc}/systemd/system/duperemove-weekly@.timer | 0 {etc => main/etc}/systemd/system/duperemove@.service | 0 .../etc}/systemd/system/ucore-paths-provision.service | 0 {etc => main/etc}/systemd/ucore-paths-provision.conf | 0 .../etc}/systemd/user/distrobox-upgrade-automatic.service | 0 .../etc}/systemd/user/distrobox-upgrade-automatic.timer | 0 {etc => main/etc}/systemd/zram-generator.conf | 0 packages.json => main/packages.json | 0 post-install.sh => main/post-install.sh | 0 {usr => main/usr}/sbin/ucore-paths-provision.sh | 0 16 files changed, 3 insertions(+), 2 deletions(-) rename Containerfile => main/Containerfile (100%) rename build.sh => main/build.sh (100%) rename {etc => main/etc}/default/duperemove (100%) rename {etc => main/etc}/sysctl.conf (100%) rename {etc => main/etc}/systemd/system/cockpit.service (100%) rename {etc => main/etc}/systemd/system/duperemove-weekly@.timer (100%) rename {etc => main/etc}/systemd/system/duperemove@.service (100%) rename {etc => main/etc}/systemd/system/ucore-paths-provision.service (100%) rename {etc => main/etc}/systemd/ucore-paths-provision.conf (100%) rename {etc => main/etc}/systemd/user/distrobox-upgrade-automatic.service (100%) rename {etc => main/etc}/systemd/user/distrobox-upgrade-automatic.timer (100%) rename {etc => main/etc}/systemd/zram-generator.conf (100%) rename packages.json => main/packages.json (100%) rename post-install.sh => main/post-install.sh (100%) rename {usr => main/usr}/sbin/ucore-paths-provision.sh (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ee2e25a..aead3d5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ on: - '**.md' - '**.txt' schedule: - - cron: '15 20 * * *' # 8:15pm UTC everyday + - cron: '20 23 * * *' # 11:20PM UTC everyday (approx 1 hour after coreos images publish) push: branches: - main @@ -108,7 +108,8 @@ jobs: uses: redhat-actions/buildah-build@v2 with: containerfiles: | - ./Containerfile + ./main/Containerfile + context: ./main image: ${{ matrix.image_name }} tags: | ${{ steps.generate-tags.outputs.alias_tags }} diff --git a/Containerfile b/main/Containerfile similarity index 100% rename from Containerfile rename to main/Containerfile diff --git a/build.sh b/main/build.sh similarity index 100% rename from build.sh rename to main/build.sh diff --git a/etc/default/duperemove b/main/etc/default/duperemove similarity index 100% rename from etc/default/duperemove rename to main/etc/default/duperemove diff --git a/etc/sysctl.conf b/main/etc/sysctl.conf similarity index 100% rename from etc/sysctl.conf rename to main/etc/sysctl.conf diff --git a/etc/systemd/system/cockpit.service b/main/etc/systemd/system/cockpit.service similarity index 100% rename from etc/systemd/system/cockpit.service rename to main/etc/systemd/system/cockpit.service diff --git a/etc/systemd/system/duperemove-weekly@.timer b/main/etc/systemd/system/duperemove-weekly@.timer similarity index 100% rename from etc/systemd/system/duperemove-weekly@.timer rename to main/etc/systemd/system/duperemove-weekly@.timer diff --git a/etc/systemd/system/duperemove@.service b/main/etc/systemd/system/duperemove@.service similarity index 100% rename from etc/systemd/system/duperemove@.service rename to main/etc/systemd/system/duperemove@.service diff --git a/etc/systemd/system/ucore-paths-provision.service b/main/etc/systemd/system/ucore-paths-provision.service similarity index 100% rename from etc/systemd/system/ucore-paths-provision.service rename to main/etc/systemd/system/ucore-paths-provision.service diff --git a/etc/systemd/ucore-paths-provision.conf b/main/etc/systemd/ucore-paths-provision.conf similarity index 100% rename from etc/systemd/ucore-paths-provision.conf rename to main/etc/systemd/ucore-paths-provision.conf diff --git a/etc/systemd/user/distrobox-upgrade-automatic.service b/main/etc/systemd/user/distrobox-upgrade-automatic.service similarity index 100% rename from etc/systemd/user/distrobox-upgrade-automatic.service rename to main/etc/systemd/user/distrobox-upgrade-automatic.service diff --git a/etc/systemd/user/distrobox-upgrade-automatic.timer b/main/etc/systemd/user/distrobox-upgrade-automatic.timer similarity index 100% rename from etc/systemd/user/distrobox-upgrade-automatic.timer rename to main/etc/systemd/user/distrobox-upgrade-automatic.timer diff --git a/etc/systemd/zram-generator.conf b/main/etc/systemd/zram-generator.conf similarity index 100% rename from etc/systemd/zram-generator.conf rename to main/etc/systemd/zram-generator.conf diff --git a/packages.json b/main/packages.json similarity index 100% rename from packages.json rename to main/packages.json diff --git a/post-install.sh b/main/post-install.sh similarity index 100% rename from post-install.sh rename to main/post-install.sh diff --git a/usr/sbin/ucore-paths-provision.sh b/main/usr/sbin/ucore-paths-provision.sh similarity index 100% rename from usr/sbin/ucore-paths-provision.sh rename to main/usr/sbin/ucore-paths-provision.sh