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.

Sign up for GitHub

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

Jump to bottom

Improve AUR package templates #4228

Merged
merged 1 commit into from
Sep 19, 2023
Merged

Improve AUR package templates #4228

merged 1 commit into from
Sep 19, 2023

Conversation

sonbui00
Copy link
Contributor

Fix #4224

  • remove armv6h
  • unique source name
  • improve pkgver/_srcver
  • fix source name in .SRCINFO

@sonbui00 sonbui00 marked this pull request as ready for review September 11, 2023 03:29
@hiddeco hiddeco added the area/ci CI related issues and pull requests label Sep 11, 2023
@hiddeco
Copy link
Member

hiddeco commented Sep 12, 2023

Still Arch distroless at present, @relu @makkes any chance one of you can confirm this works as expected?

@relu
Copy link
Member

relu commented Sep 12, 2023

I'll have a look at it a bit later today.

makkes
makkes reviewed Sep 12, 2023
View reviewed changes
Copy link
Member

@makkes makkes left a comment

Choose a reason for hiding this comment

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

Except for the PKGVER usage this lgtm.

.github/aur/flux-bin/PKGBUILD.template Outdated Show resolved Hide resolved
@sonbui00 sonbui00 requested review from hiddeco and makkes September 12, 2023 09:12
@sonbui00 sonbui00 mentioned this pull request Sep 12, 2023
Merged
relu
relu requested changes Sep 12, 2023
View reviewed changes
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.

Thank you, @sonbui00! One more improvement that I suggest be made here is replacing the SHA256 hashing from the script and templates and replacing that with updpkgsums.

Remove this and the respective envsubst references and add updpkgsums after envsubst. You can then also remove the sha256sums_* lines from PKGBUILD.

Also, we can drop the .SRCINFO.template and the respective envsubst command to generate .SRCINFO in favor of running makepkg --printsrcinfo > .SRCINFO.

@sonbui00
Copy link
Contributor Author

Thank you, @sonbui00! One more improvement that I suggest be made here is replacing the SHA256 hashing from the script and templates and replacing that with updpkgsums.

Remove this and the respective envsubst references and add updpkgsums after envsubst. You can then also remove the sha256sums_* lines from PKGBUILD.

Also, we can drop the .SRCINFO.template and the respective envsubst command to generate .SRCINFO in favor of running makepkg --printsrcinfo > .SRCINFO.

@relu There are some issues/tradeoff here:

  • We run this on ubuntu, so we need to install updpkgsums and makepkg. These packages can install via github action, but it also slow down process
  • I think updpkgsums need to download release packages that maybe not available at that time (need to check gorelease flow) and the download also make process slow down

@sonbui00 sonbui00 requested a review from relu September 13, 2023 01:05
relu
relu approved these changes Sep 13, 2023
View reviewed changes
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.

Fair points, thanks for looking into it. I think we can leave as is for now considering the limitations.

@sonbui00
Copy link
Contributor Author

@relu Maybe this #4026
https://goreleaser.com/customization/aur/

@sonbui00 @hiddeco
Improve AUR package templates
f9e7190 
- remove armv6h fluxcd#4224
- unique source name fluxcd#4224
- improve pkgver/_srcver fluxcd#4224
- fix source name in .SRCINFO

Signed-off-by: Son Bui <sonbv00@gmail.com>
@hiddeco hiddeco added the backport:release/v2.1.x To be backported to release/v2.1.x label Sep 19, 2023
@stefanprodan stefanprodan mentioned this pull request Sep 19, 2023
Closed
18 tasks
@hiddeco hiddeco merged commit d3eacd4 into fluxcd:main Sep 19, 2023
8 checks passed
@fluxcdbot fluxcdbot mentioned this pull request Sep 19, 2023
Merged
@fluxcdbot
Copy link
Member

Successfully created backport PR for release/v2.1.x:

nrdufour added a commit to nrdufour/home-ops that referenced this pull request Oct 3, 2023
@nrdufour
chore(deps): update dependency fluxcd/flux2 to v2.1.1 (#94)
a349b22 
This PR contains the following updates:

| Package | Type | Update | Change |
|---|---|---|---|
| [fluxcd/flux2](https://github.com/fluxcd/flux2) | Kustomization | patch | `v2.1.0` -> `v2.1.1` |

---

### Release Notes

<details>
<summary>fluxcd/flux2 (fluxcd/flux2)</summary>

### [`v2.1.1`](https://github.com/fluxcd/flux2/releases/tag/v2.1.1)

[Compare Source](fluxcd/flux2@v2.1.0...v2.1.1)

#### Highlights

Flux `v2.1.1` is a patch release which comes with various fixes. Users are encouraged to upgrade for the best experience.

##### Fixes

-   Use auto lookup strategy for Buckets to widen support for S3-compatible object storage services (`source-controller`).
-   Fix Secret type check for HelmRepositories TLS certs referred in `.spec.secretRef` (`source-controller`).
-   Fix the branch name reporting when the push branch is the same as the checkout branch (`image-automation-controller`).
-   Restore Helm logs inclusion in failure events (`helm-controller`).
-   Fix the impersonation of the default service account when diffing HelmReleases (`helm-controller`).
-   Check source for `nil` artifact before loading Helm charts (`helm-controller`).
-   Update the description of Kubernetes specific flag to distinguish them from Flux bootstrap flags (`flux` CLI).

#### Components changelog

-   source-controller [v1.1.1](https://github.com/fluxcd/source-controller/blob/v1.1.1/CHANGELOG.md)
-   helm-controller [v0.36.1](https://github.com/fluxcd/helm-controller/blob/v0.36.1/CHANGELOG.md)
-   image-automation-controller [v0.36.1](https://github.com/fluxcd/image-automation-controller/blob/v0.36.1/CHANGELOG.md)

#### CLI Changelog

-   PR [#&#8203;4255](fluxcd/flux2#4255) - [@&#8203;hiddeco](https://github.com/hiddeco) - tests/azure: update controller dependencies
-   PR [#&#8203;4251](fluxcd/flux2#4251) - [@&#8203;fluxcdbot](https://github.com/fluxcdbot) - Update toolkit components
-   PR [#&#8203;4246](fluxcd/flux2#4246) - [@&#8203;dependabot](https://github.com/dependabot)\[bot] - build(deps): bump the ci group with 4 updates
-   PR [#&#8203;4238](fluxcd/flux2#4238) - [@&#8203;makkes](https://github.com/makkes) - Upgrade github.com/fluxcd/pkg/{git,git/gogit}
-   PR [#&#8203;4233](fluxcd/flux2#4233) - [@&#8203;sonbui00](https://github.com/sonbui00) - chore: remove support armv6h for aur package
-   PR [#&#8203;4228](fluxcd/flux2#4228) - [@&#8203;sonbui00](https://github.com/sonbui00) - Improve AUR package templates
-   PR [#&#8203;4227](fluxcd/flux2#4227) - [@&#8203;dependabot](https://github.com/dependabot)\[bot] - build(deps): bump the ci group with 3 updates
-   PR [#&#8203;4226](fluxcd/flux2#4226) - [@&#8203;somtochiama](https://github.com/somtochiama) - Update description of kubeconfig specific flag
-   PR [#&#8203;4222](fluxcd/flux2#4222) - [@&#8203;dependabot](https://github.com/dependabot)\[bot] - build(deps): bump github.com/cyphar/filepath-securejoin from 0.2.3 to 0.2.4 in /tests/integration
-   PR [#&#8203;4221](fluxcd/flux2#4221) - [@&#8203;dependabot](https://github.com/dependabot)\[bot] - build(deps): bump github.com/cyphar/filepath-securejoin from 0.2.3 to 0.2.4 in /tests/azure
-   PR [#&#8203;4215](fluxcd/flux2#4215) - [@&#8203;dependabot](https://github.com/dependabot)\[bot] - build(deps): bump the ci group with 4 updates
-   PR [#&#8203;4213](fluxcd/flux2#4213) - [@&#8203;dependabot](https://github.com/dependabot)\[bot] - build(deps): bump github.com/docker/distribution from 2.8.1+incompatible to 2.8.2+incompatible in /tests/integration
-   PR [#&#8203;4212](fluxcd/flux2#4212) - [@&#8203;dependabot](https://github.com/dependabot)\[bot] - build(deps): bump github.com/docker/docker from 23.0.1+incompatible to 23.0.3+incompatible in /tests/integration
-   PR [#&#8203;4198](fluxcd/flux2#4198) - [@&#8203;makkes](https://github.com/makkes) - Add 2.1.x backport label
-   PR [#&#8203;4197](fluxcd/flux2#4197) - [@&#8203;stefanprodan](https://github.com/stefanprodan) - Fix links to fluxcd.io
-   PR [#&#8203;4195](fluxcd/flux2#4195) - [@&#8203;dependabot](https://github.com/dependabot)\[bot] - build(deps): bump the ci group with 2 updates

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this PR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this PR, check this box

---

This PR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNi45Ni4wIiwidXBkYXRlZEluVmVyIjoiMzYuOTYuMCIsInRhcmdldEJyYW5jaCI6Im1haW4ifQ==-->

Reviewed-on: https://git.home/nrdufour/home-ops/pulls/94
Co-authored-by: Renovate <renovate@ptinem.io>
Co-committed-by: Renovate <renovate@ptinem.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hiddeco hiddeco hiddeco approved these changes

@relu relu relu approved these changes

@makkes makkes Awaiting requested review from makkes

Assignees
No one assigned
Labels
area/ci CI related issues and pull requests backport:release/v2.1.x To be backported to release/v2.1.x
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Improve AUR package templates
5 participants
@sonbui00 @hiddeco @relu @fluxcdbot @makkes