Skip to content

Commit

Permalink
Merge branch 'template' into merge-template
Browse files Browse the repository at this point in the history
  • Loading branch information
zelikos committed Feb 25, 2024
2 parents a9beb46 + e7824c0 commit b6d4ece
Show file tree
Hide file tree
Showing 12 changed files with 11 additions and 386 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @castrojo
* @xynydev
2 changes: 0 additions & 2 deletions .github/semantic.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ jobs:
fi
- name: Add yq (for reading recipe.yml)
uses: mikefarah/yq@v4.40.5
uses: mikefarah/yq@v4.41.1

- name: Gather image data from recipe
run: |
Expand Down
13 changes: 6 additions & 7 deletions .github/workflows/release-iso.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
on:
push:
paths:
- 'boot_menu.yml'
- '.github/workflows/release-iso.yml'
- "boot_menu.yml"
- ".github/workflows/release-iso.yml"
workflow_dispatch:

name: release-iso
Expand All @@ -12,13 +12,13 @@ jobs:
runs-on: ubuntu-latest
permissions:
contents: write
container:
container:
image: fedora:39
options: --privileged
steps:
- uses: actions/checkout@v4
- name: Generate ISO
uses: ublue-os/[email protected]
- name: Generate ISO
uses: ublue-os/isogenerator-old@v2.3.1
id: isogenerator
with:
image-name: ${{ github.event.repository.name }}
Expand All @@ -43,5 +43,4 @@ jobs:
- name: Upload SHA256SUM
env:
GITHUB_TOKEN: ${{ github.token }}
run:
gh release upload auto-iso ${{ steps.isogenerator.outputs.sha256sum-path }} -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber
run: gh release upload auto-iso ${{ steps.isogenerator.outputs.sha256sum-path }} -R ${{ github.repository_owner }}/${{ github.event.repository.name }} --clobber
128 changes: 0 additions & 128 deletions CODE_OF_CONDUCT.md

This file was deleted.

141 changes: 0 additions & 141 deletions CONTRIBUTING.md

This file was deleted.

2 changes: 1 addition & 1 deletion Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ COPY config /tmp/config/

# Copy modules
# The default modules are inside ublue-os/bling
COPY --from=ghcr.io/ublue-os/bling:latest /modules /tmp/modules/
COPY --from=ghcr.io/blue-build/modules:latest /modules /tmp/modules/
# Custom modules overwrite defaults
COPY modules /tmp/modules/

Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ After first boot, the first of the system updater will automatically rebase you
On first boot of any Zeliblue flavor, a `justfile` is created in the user's home directory at `$HOME/.justfile`. The `justfile` gives access to Zeliblue's `just` commands; users can also add their own custom commands.

Commands provided by Zeliblue are documented below.

For more about `just`, see [the manual](https://just.systems/man/en/).

### setup-davincibox
Expand Down
4 changes: 2 additions & 2 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# Editing this file directly is an unsupported configuration.

# Tell build process to exit if there are any errors.
set -oue pipefail
set -euo pipefail

export BLING_DIRECTORY="/tmp/bling"
export CONFIG_DIRECTORY="/tmp/config"
Expand All @@ -16,7 +16,7 @@ export MODULE_DIRECTORY="/tmp/modules"
# https://mikefarah.gitbook.io/yq/usage/tips-and-tricks#yq-in-a-bash-loop
get_yaml_array() {
# creates array $1 with content at key $2 from $3
readarray "$1" < <(echo "$3" | yq -I=0 "$2")
readarray -t "$1" < <(echo "$3" | yq -I=0 "$2")
}
export -f get_yaml_array # this makes the function available to all modules

Expand Down
Loading

0 comments on commit b6d4ece

Please sign in to comment.