diff options
| author | Edwin van Leeuwen <edwinvanl@tuta.io> | 2022-02-16 08:15:58 +0000 |
|---|---|---|
| committer | Edwin van Leeuwen <edwinvanl@tuta.io> | 2022-02-16 08:15:58 +0000 |
| commit | 272c4069011e0fa870da938c8ef13f80595f9eaa (patch) | |
| tree | d970004dc2e189b3dc765c645109f8c59b76ec49 /.gitlab-ci.yml | |
| parent | 8be37992582c57d600f978b73ab1d44e90738a74 (diff) | |
config: Future proof config loading
When loading config from disk we now merge it with the default config.
This means that the config can only contain overridden/saved values,
instead of the whole config.
Also makes it easier to add new fields to the config, because we won't
need to explicitly remember to add them to 'config::load()'.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f5fccca..c458af9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,8 +15,9 @@ build:arch: script: - yay -Sy --noconfirm cmake git cpr nlohmann-json pugixml - cd aur - - echo $CI_COMMIT_BRANCH - - sed -i 's:PLACEHOLDER:'$CI_COMMIT_BRANCH':' PKGBUILD +# If this does not work, then try CI_COMMIT_REF_NAME + - echo $CI_COMMIT_REF_SLUG + - sed -i 's:PLACEHOLDER:'$CI_COMMIT_REF_SLUG':' PKGBUILD - makepkg PKGBUILD artifacts: paths: |