Merge branch 'main' into gnome-extensions-rewrite
This commit is contained in:
commit
5b954d2d8f
6 changed files with 51 additions and 17 deletions
17
.github/workflows/rebuild-website.yml
vendored
17
.github/workflows/rebuild-website.yml
vendored
|
|
@ -1,17 +0,0 @@
|
|||
name: rebuild-website
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths: # only rebuild when related files change
|
||||
- "**/module.yml"
|
||||
- "/modules.json"
|
||||
- "**/README.md"
|
||||
|
||||
jobs:
|
||||
rebuild-website:
|
||||
name: Trigger build hook for website on Netlify
|
||||
runs-on: ubuntu-latest
|
||||
if: github.repository == 'blue-build/modules'
|
||||
steps:
|
||||
- run: curl -X POST -d {} https://api.netlify.com/build_hooks/65bf6b0dd164b64659beafd5
|
||||
15
.github/workflows/reviewdog.yml
vendored
Normal file
15
.github/workflows/reviewdog.yml
vendored
Normal file
|
|
@ -0,0 +1,15 @@
|
|||
name: reviewdog
|
||||
on:
|
||||
pull_request:
|
||||
|
||||
jobs:
|
||||
shellcheck:
|
||||
name: runner / shellcheck
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- name: shellcheck
|
||||
uses: reviewdog/action-shellcheck@v1
|
||||
with:
|
||||
github_token: ${{ github.token }}
|
||||
reporter: github-pr-review
|
||||
19
.github/workflows/trigger-rebuilds.yml
vendored
Normal file
19
.github/workflows/trigger-rebuilds.yml
vendored
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
name: rebuild-website
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
paths: # only rebuild when related files change
|
||||
- "**.md"
|
||||
- "**.yml"
|
||||
- "**.json"
|
||||
- "**.tsp"
|
||||
|
||||
jobs:
|
||||
rebuild-website:
|
||||
name: Trigger deploy hooks
|
||||
runs-on: ubuntu-latest
|
||||
if: github.repository == 'blue-build/modules'
|
||||
steps:
|
||||
- run: echo "website:" && curl -X POST -d {} ${{ secrets.WEBSITE_DEPLOY_HOOK }}
|
||||
- run: echo "schemas:" && curl -X POST -d {} ${{ secrets.SCHEMAS_DEPLOY_HOOK }}
|
||||
5
.vscode/extensions.json
vendored
Normal file
5
.vscode/extensions.json
vendored
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
"recommendations": [
|
||||
"timonwong.shellcheck"
|
||||
]
|
||||
}
|
||||
|
|
@ -6,6 +6,8 @@ The module first downloads the repository files from repositories declared under
|
|||
|
||||
Then the module installs the packages declared under `install:` using `rpm-ostree install`, it removes the packages declared under `remove:` using `rpm-ostree override remove`. If there are packages declared under both `install:` and `remove:` a hybrid command `rpm-ostree remove <packages> --install <packages>` is used, which should allow you to switch required packages for other ones.
|
||||
|
||||
Installing RPM packages directly from a `http(s)` url that points to the RPM file is also supported, you can just put the URLs under `install:` and they'll be installed along with the other packages.
|
||||
|
||||
:::note
|
||||
[Removed packages are still present in the underlying ostree repository](https://coreos.github.io/rpm-ostree/administrator-handbook/#removing-a-base-package), what `remove` does is kind of like hiding them from the system, it doesn't free up storage space.
|
||||
:::
|
||||
|
|
|
|||
|
|
@ -34,6 +34,16 @@ fi
|
|||
get_yaml_array INSTALL '.install[]' "$1"
|
||||
get_yaml_array REMOVE '.remove[]' "$1"
|
||||
|
||||
if [[ ${#INSTALL[@]} -gt 0 ]]; then
|
||||
for PKG in "${INSTALL[@]}"; do
|
||||
if [[ "$PKG" =~ ^https?:\/\/.* ]]; then
|
||||
echo "Installing directly from URL: ${PKG}"
|
||||
rpm-ostree install "$PKG"
|
||||
INSTALL=( "${INSTALL[@]/$PKG}" ) # delete URL from install array
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# The installation is done with some wordsplitting hacks
|
||||
# because of errors when doing array destructuring at the installation step.
|
||||
# This is different from other ublue projects and could be investigated further.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue