chore: remove F39 workflow and refactor matrixes #718
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
p5
changed the title
p5
changed the title
p5
commented
Feb 19, 2025
Comment on lines
+19
to
30
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| image_name: | ||
| - base | ||
| - silverblue | ||
| - kinoite | ||
| - sericea | ||
| - onyx | ||
| - lazurite | ||
| - vauxite | ||
| with: |
There was a problem hiding this comment.
Once F42 is out, we can simply duplicate this workflow and remove the images we don't wish to build.
Saves us trying to create a matrix which has different behaviour for 3 different fedora versions:
- 40 - use sericea, onyx naming etc
- 41 - switch to *-atomic naming
- 42 - remove unofficial images
Comment on lines
+30
to
+40
| include: | ||
| - image_name: base | ||
| source_image_name: base-atomic | ||
| - image_name: onyx | ||
| source_image_name: budgie-atomic | ||
| - image_name: sericea | ||
| source_image_name: sway-atomic | ||
| - image_name: lazurite | ||
| source_image_name: lxqt-atomic | ||
| - image_name: vauxite | ||
| source_image_name: xfce-atomic |
There was a problem hiding this comment.
From F42+, we can switch to the *-atomic naming wherever used upstream, so this will only be used in F41 workflows.
Comment on lines
-24
to
-47
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| fedora_version: | ||
| - ${{ inputs.fedora_version }} | ||
| image_name: | ||
| - silverblue | ||
| - kinoite | ||
| - sericea | ||
| - onyx | ||
| - base | ||
| - lazurite | ||
| - vauxite | ||
| include: | ||
| - image_name: base | ||
| source_image: ${{ inputs.fedora_version == '41' && 'base-atomic' || '' }} | ||
| - image_name: sericea | ||
| source_image: ${{ inputs.fedora_version == '41' && 'sway-atomic' || '' }} | ||
| - image_name: onyx | ||
| source_image: ${{ inputs.fedora_version == '41' && 'budgie-atomic' || '' }} | ||
| - image_name: lazurite | ||
| source_image: ${{ inputs.fedora_version == '41' && 'lxqt-atomic' || '' }} | ||
| - image_name: vauxite | ||
| source_image: ${{ inputs.fedora_version == '41' && 'xfce-atomic' || '' }} |
There was a problem hiding this comment.
All matrix logic is in the parent workflows so you don't need any conditionals here
Comment on lines
34
to
48
| - name: Matrix Variables | ||
| shell: bash | ||
| env: | ||
| MATRIX_SOURCE_IMAGE: ${{ matrix.source_image }} | ||
| MATRIX_IMAGE_NAME: ${{ matrix.image_name }} | ||
| IMAGE_NAME: ${{ inputs.image_name }} | ||
| FEDORA_VERSION: ${{ inputs.fedora_version }} | ||
| SOURCE_IMAGE_NAME: ${{ inputs.source_image_name }} | ||
| run: | | ||
| if [[ -z $MATRIX_SOURCE_IMAGE ]]; then | ||
| echo "MATRIX_SOURCE_IMAGE empty" | ||
| SOURCE_IMAGE=$MATRIX_IMAGE_NAME | ||
| else | ||
| echo "MATRIX_SOURCE_IMAGE not empty" | ||
| SOURCE_IMAGE=$MATRIX_SOURCE_IMAGE | ||
| SOURCE_IMAGE=$IMAGE_NAME | ||
| if [[ "$SOURCE_IMAGE_NAME" != "" ]]; then | ||
| SOURCE_IMAGE=$SOURCE_IMAGE_NAME | ||
| fi | ||
|
|
||
| echo "SOURCE_ORG=fedora-ostree-desktops" >> $GITHUB_ENV | ||
| echo "IMAGE_NAME=$MATRIX_IMAGE_NAME-main" >> $GITHUB_ENV | ||
| echo "IMAGE_NAME=$IMAGE_NAME-main" >> $GITHUB_ENV | ||
| echo "SOURCE_IMAGE=$SOURCE_IMAGE" >> $GITHUB_ENV |
There was a problem hiding this comment.
This can be removed when F41 is EOL'd. It's needed so we can keep the old "sericea" etc naming convention for the existing images
This was an incorrect conflict resolution
dosubot
bot
added
the
size:L
castrojo
approved these changes
Feb 20, 2025
bsherman
approved these changes
Feb 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This removes the F39 workflow since it's disabled now 39 is EOL
Also refactors the matrix out of the reusable build, which makes it far easier when we come to deprecating the unofficial desktops.
Once merged, I'll make a F42 draft PR where we actually stop building for these DEs in F42+.