diff --git a/.github/workflows/build-coreos-aurora.yml b/.github/workflows/build-coreos-aurora.yml index ef62b3f6485..5a6b13b17d6 100644 --- a/.github/workflows/build-coreos-aurora.yml +++ b/.github/workflows/build-coreos-aurora.yml @@ -8,7 +8,7 @@ on: - '**.md' - 'system_files/silverblue/**' schedule: - - cron: '41 5 * * 2' # 5:41 UTC every Tuesday + - cron: '41 5 * * *' # 5:41 UTC everyday workflow_dispatch: jobs: @@ -20,4 +20,5 @@ jobs: brand_name: aurora fedora_version: stable rechunk: true + weekly_tag_day: Tuesday diff --git a/.github/workflows/build-coreos-bluefin.yml b/.github/workflows/build-coreos-bluefin.yml index 60654d59c28..67e0a362f48 100644 --- a/.github/workflows/build-coreos-bluefin.yml +++ b/.github/workflows/build-coreos-bluefin.yml @@ -8,7 +8,7 @@ on: - '**.md' - 'system_files/kinoite/**' schedule: - - cron: '41 5 * * 2' # 5:41 UTC every Tuesday + - cron: '41 5 * * *' # 5:41 UTC everyday workflow_dispatch: jobs: @@ -20,4 +20,5 @@ jobs: brand_name: bluefin fedora_version: stable rechunk: true + weekly_tag_day: Tuesday diff --git a/.github/workflows/reusable-build.yml b/.github/workflows/reusable-build.yml index 995052996b9..92ba676911d 100644 --- a/.github/workflows/reusable-build.yml +++ b/.github/workflows/reusable-build.yml @@ -15,6 +15,11 @@ on: required: false type: boolean default: false + weekly_tag_day: + description: "Tag stable weekly on for example 'Tuesday'" + required: false + type: string + default: Tuesday outputs: images: description: "An array of images built and pushed to the registry" @@ -237,7 +242,15 @@ jobs: fi if [[ ${{ matrix.fedora_version }} == "stable" ]]; then - BUILD_TAGS=("${FEDORA_VERSION}" "${FEDORA_VERSION}-${TIMESTAMP}") + BUILD_TAGS=("${FEDORA_VERSION}-daily" "${FEDORA_VERSION}-daily-${TIMESTAMP}") + if [[ ${{ github.event_name }} == "schedule" ]]; then + TODAY="$(date +%A)" + if [[ "${TODAY}" == "${{ inputs.weekly_tag_day }}" ]]; then + BUILD_TAGS+=("${FEDORA_VERSION}" "${FEDORA_VERSION}-${TIMESTAMP}") + fi + else + BUILD_TAGS+=("${FEDORA_VERSION}" "${FEDORA_VERSION}-${TIMESTAMP}") + fi else BUILD_TAGS=("${{ env.fedora_version }}" "${{ env.fedora_version }}-${TIMESTAMP}") fi @@ -267,7 +280,7 @@ jobs: BUILD_TAGS+=("gts") echo "DEFAULT_TAG=gts" >> $GITHUB_ENV elif [[ "$IS_COREOS" == "true" ]]; then - echo "DEFAULT_TAG=stable" >> $GITHUB_ENV + echo "DEFAULT_TAG=stable-daily" >> $GITHUB_ENV fi fi