-
-
Notifications
You must be signed in to change notification settings - Fork 159
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
73 changed files
with
973 additions
and
366 deletions.
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,7 +24,7 @@ concurrency: | |
| jobs: | ||
| build_container: | ||
| name: image | ||
| runs-on: ubuntu-latest | ||
| runs-on: ubuntu-22.04 | ||
| continue-on-error: false | ||
| outputs: | ||
| image_full: ${{ steps.generate-outputs.outputs.image }} | ||
|
|
@@ -78,6 +78,7 @@ jobs: | |
| echo "AKMODS_FLAVOR=asus" >> $GITHUB_ENV | ||
| elif [[ "${{ matrix.image_flavor }}" =~ "surface" ]]; then | ||
| echo "AKMODS_FLAVOR=surface" >> $GITHUB_ENV | ||
| echo "KERNEL_SUFFIX=surface" >> $GITHUB_ENV | ||
| else | ||
| echo "AKMODS_FLAVOR=main" >> $GITHUB_ENV | ||
| fi | ||
|
|
@@ -97,11 +98,11 @@ jobs: | |
| registry: cgr.dev/chainguard | ||
|
|
||
| - name: Maximize build space | ||
| uses: ublue-os/remove-unwanted-software@v6 | ||
| uses: ublue-os/remove-unwanted-software@v7 | ||
|
|
||
| - name: Check just syntax | ||
| uses: ublue-os/just-action@v1 | ||
|
|
||
| - name: Generate tags | ||
| id: generate-tags | ||
| shell: bash | ||
|
|
@@ -144,14 +145,18 @@ jobs: | |
| if [[ "$IS_LATEST_VERSION" == "true" ]] && \ | ||
| [[ "$IS_STABLE_VERSION" == "true" ]]; then | ||
| BUILD_TAGS+=("testing") | ||
| echo "DEFAULT_TAG=testing" >> $GITHUB_ENV | ||
| elif [[ "$IS_GTS_VERSION" == "true" ]]; then | ||
| BUILD_TAGS+=("gts-testing") | ||
| echo "DEFAULT_TAG=gts-testing" >> $GITHUB_ENV | ||
| fi | ||
| elif [[ "$IS_LATEST_VERSION" == "true" ]] && \ | ||
| [[ "$IS_STABLE_VERSION" == "true" ]]; then | ||
| BUILD_TAGS+=("latest") | ||
| echo "DEFAULT_TAG=latest" >> $GITHUB_ENV | ||
| elif [[ "$IS_GTS_VERSION" == "true" ]]; then | ||
| BUILD_TAGS+=("gts") | ||
| echo "DEFAULT_TAG=gts" >> $GITHUB_ENV | ||
| fi | ||
| if [[ "${{ github.event_name }}" == "pull_request" ]]; then | ||
|
|
@@ -160,6 +165,7 @@ jobs: | |
| echo "${TAG}" | ||
| done | ||
| alias_tags=("${COMMIT_TAGS[@]}") | ||
| echo "DEFAULT_TAG=${SHA_SHORT}-${FEDORA_VERSION}" >> $GITHUB_ENV | ||
| else | ||
| alias_tags=("${BUILD_TAGS[@]}") | ||
| fi | ||
|
|
@@ -221,6 +227,17 @@ jobs: | |
| extra-args: | | ||
| --target=${{ env.TARGET_NAME }} | ||
| - name: Sign kernel | ||
| uses: ublue-os/[email protected] | ||
| with: | ||
| image: ${{ steps.build_image.outputs.image }} | ||
| default-tag: ${{ env.DEFAULT_TAG }} | ||
| privkey: ${{ secrets.AKMOD_PRIVKEY_20230518 }} | ||
| pubkey: /etc/pki/akmods/certs/akmods-ublue.der | ||
| tags: ${{ steps.build_image.outputs.tags }} | ||
| kernel_suffix: ${{ env.KERNEL_SUFFIX }} | ||
| strip: false | ||
|
|
||
| # Workaround bug where capital letters in your GitHub username make it impossible to push to GHCR. | ||
| # https://github.com/macbre/push-to-ghcr/issues/12 | ||
| - name: Lowercase Registry | ||
|
|
||
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,108 @@ | ||
| { | ||
| "version": "2.0.0", | ||
| "tasks": [ | ||
| { | ||
| "label": "Connect to VM", | ||
| "dependsOn": [ | ||
| "Run-ISO", | ||
| "Open Browser" | ||
| ], | ||
| "problemMatcher": [] | ||
| }, | ||
| { | ||
| "label": "Open Browser", | ||
| "command": "${input:openSimpleBrowser}", | ||
| "problemMatcher": [] | ||
| }, | ||
| { | ||
| "label": "Build Container", | ||
| "command": "just", | ||
| "args": [ | ||
| "build", | ||
| "${input:outputChoice}" | ||
| ], | ||
| "problemMatcher": [], | ||
| "group": { | ||
| "kind": "build", | ||
| "isDefault": true | ||
| } | ||
| }, | ||
| { | ||
| "label": "Build ISO", | ||
| "command": "just", | ||
| "args": [ | ||
| "build-iso", | ||
| "${input:outputChoice}" | ||
| ], | ||
| "problemMatcher": [] | ||
| }, | ||
| { | ||
| "label": "Build ISO (testing)", | ||
| "command": "just", | ||
| "args": [ | ||
| "build-iso-installer-main", | ||
| "${input:outputChoice}" | ||
| ], | ||
| "problemMatcher": [] | ||
| }, | ||
| { | ||
| "label": "Run-ISO", | ||
| "command": "just", | ||
| "args": [ | ||
| "run-iso", | ||
| "${input:outputChoice}" | ||
| ], | ||
| "problemMatcher": [], | ||
| "isBackground": true | ||
| }, | ||
| { | ||
| "label": "List Images", | ||
| "command": "just", | ||
| "args": [ | ||
| "list-images" | ||
| ], | ||
| "problemMatcher": [] | ||
| }, | ||
| { | ||
| "label": "Check justfiles", | ||
| "command": "just", | ||
| "args": [ | ||
| "just-check" | ||
| ], | ||
| "problemMatcher": [] | ||
| }, | ||
| { | ||
| "label": "Run Container", | ||
| "command": "just", | ||
| "args": [ | ||
| "run-container", | ||
| "${input:outputChoice}" | ||
| ], | ||
| "problemMatcher": [] | ||
| } | ||
| ], | ||
| "inputs": [ | ||
| { | ||
| "id": "openSimpleBrowser", | ||
| "type": "command", | ||
| "command": "simpleBrowser.show", | ||
| "args": [ | ||
| "http://localhost:8006" | ||
| ] | ||
| }, | ||
| { | ||
| "id": "outputChoice", | ||
| "type": "pickString", | ||
| "description": "Choose which container to build", | ||
| "default": "bluefin", | ||
| "options": [ | ||
| "bluefin", | ||
| "bluefin-dx", | ||
| "bluefin latest", | ||
| "bluefin-dx latest", | ||
| "aurora", | ||
| "aurora-dx" | ||
| ] | ||
| } | ||
| ] | ||
| } |
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
Oops, something went wrong.