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

refactor(ci): stable-daily tagging #1815

Merged
merged 2 commits into from
Oct 24, 2024
Merged

refactor(ci): stable-daily tagging #1815

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
ac0527a
refactor(ci): stable-daily tagging
befanyt Oct 20, 2024
afa39c1
feat(ci): enable manual building of stable or stable-daily
befanyt Oct 20, 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
16 changes: 16 additions & 0 deletions .github/workflows/build-coreos-aurora-daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Aurora Stable Daily
on:
workflow_dispatch:

jobs:
build:
name: build
uses: ./.github/workflows/reusable-build.yml
secrets: inherit
with:
brand_name: aurora
fedora_version: stable
rechunk: true
build_stable_daily: true
build_stable_weekly: false

16 changes: 16 additions & 0 deletions .github/workflows/build-coreos-aurora-weekly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Aurora Stable Weekly
on:
workflow_dispatch:

jobs:
build:
name: build
uses: ./.github/workflows/reusable-build.yml
secrets: inherit
with:
brand_name: aurora
fedora_version: stable
rechunk: true
build_stable_daily: false
build_stable_weekly: true

17 changes: 17 additions & 0 deletions .github/workflows/build-coreos-bluefin-daily.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Bluefin Stable Daily
on:
workflow_dispatch:

jobs:
build:
name: build
uses: ./.github/workflows/reusable-build.yml
secrets: inherit
with:
brand_name: bluefin
fedora_version: stable
rechunk: true
build_stable_daily: true
build_stable_weekly: false


16 changes: 16 additions & 0 deletions .github/workflows/build-coreos-bluefin-weekly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Bluefin Stable Weekly
on:
workflow_dispatch:

jobs:
build:
name: build
uses: ./.github/workflows/reusable-build.yml
secrets: inherit
with:
brand_name: bluefin
fedora_version: stable
rechunk: true
build_stable_daily: false
build_stable_weekly: true

33 changes: 25 additions & 8 deletions .github/workflows/reusable-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,16 @@ on:
required: false
type: string
default: Tuesday
build_stable_daily:
Copy link
Member

Choose a reason for hiding this comment

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

This is fine for now, but it feels a bit like a belt and suspenders situation. We are being overly specific it feels like.

description: "Build with 'stable-daily' tag"
required: false
type: boolean
default: true
build_stable_weekly:
description: "Build with 'stable' tag"
required: false
type: boolean
default: true
outputs:
images:
description: "An array of images built and pushed to the registry"
Expand Down Expand Up @@ -246,15 +256,18 @@ jobs:
COMMIT_TAGS+=("${SHA_SHORT}")
fi

TODAY="$(date +%A)"
if [[ ${{ matrix.fedora_version }} == "stable" ]]; then
Copy link
Member

Choose a reason for hiding this comment

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

This is much more readable now.

That said I think we have room for improvements in the future.

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
if [[ ${{ github.event_name }} == "schedule" ]] && \
[[ "${{ inputs.weekly_tag_day }}" != "${TODAY}" ]]; then
BUILD_TAGS+=("stable-daily" "stable-daily-${TIMESTAMP}")
elif [[ ${{ inputs.build_stable_daily }} == "false" ]]; then
BUILD_TAGS+=("stable" "stable-${TIMESTAMP}")
elif [[ ${{ inputs.build_stable_weekly }} == "false" ]]; then
BUILD_TAGS+=("stable-daily" "stable-daily-${TIMESTAMP}")
else
BUILD_TAGS+=("${FEDORA_VERSION}" "${FEDORA_VERSION}-${TIMESTAMP}")
BUILD_TAGS+=("stable" "stable-${TIMESTAMP}")
BUILD_TAGS+=("stable-daily" "stable-daily-${TIMESTAMP}")
fi
else
BUILD_TAGS=("${{ env.fedora_version }}" "${{ env.fedora_version }}-${TIMESTAMP}")
Expand Down Expand Up @@ -291,7 +304,11 @@ jobs:
BUILD_TAGS+=("beta")
echo "DEFAULT_TAG=beta" >> $GITHUB_ENV
elif [[ "$IS_COREOS" == "true" ]]; then
echo "DEFAULT_TAG=stable-daily" >> $GITHUB_ENV
if [[ ${{ inputs.build_stable_daily }} == "true" ]]; then
echo "DEFAULT_TAG=stable-daily" >> $GITHUB_ENV
else
echo "DEFAULT_TAG=stable" >> $GITHUB_ENV
fi
fi
fi

Expand Down