Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make manifests dir bundle.sh configurable #1066

Merged
merged 2 commits into from
Mar 9, 2021
Merged

Conversation

hiddeco
Copy link
Member

@hiddeco hiddeco commented Mar 8, 2021

There was an assumption in this script that it is always executed in Git
repository/directory, this is however not always true, for example when
one downloads the .tar.gz that is made available for every release
by GitHub (and used in one of our AUR packages).

This commit changes this, and makes the first argument of bundle.sh
configurable, so a custom manifests directory can always be defined
without relying on Git.

Omitting it, or passing an empty string, will still fall back to the
previous behavior of using git rev-parse --show-toplevel.

There was an assumption in this script that it is always executed in Git
repository/directory, this is however not always true, for example when
one downloads the `.tar.gz` that is made available for every release
by GitHub (and used in one of our AUR packages).

This commit changes this, and makes the first argument of `bundle.sh`
configurable, so a custom manifests directory can always be defined
_without_ relying on Git.

Omitting it, or passing an empty string, will still fall back to the
previous behavior of using `git rev-parse --show-toplevel`.

Signed-off-by: Hidde Beydals <hello@hidde.co>
@hiddeco hiddeco added the area/ci CI related issues and pull requests label Mar 8, 2021
This commit makes a couple of changes to the `flux-{go,scm}` packages
so that they properly build again:

- The manifests are generated before the compilation of the `flux`
  binary.
- The `makedepends` have been updated to require a version of Go
  `>=1.16` (which is a requirement for `embed`).
- The `makedepends` have been updated to require a `kustomize` version
  `>=3.0` (as we use `transformers`).

Signed-off-by: Hidde Beydals <hello@hidde.co>
Copy link
Member

@relu relu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM ✔️

@hiddeco hiddeco merged commit a4b9191 into main Mar 9, 2021
@hiddeco hiddeco deleted the manifest-bundle-tweaks branch March 9, 2021 08:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area/ci CI related issues and pull requests
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants