Skip to content

Add FreeBSD CI#3274

Merged
superm1 merged 2 commits intomasterfrom
wip/3mdeb/freebsd-ci
Jun 5, 2021
Merged

Add FreeBSD CI#3274
superm1 merged 2 commits intomasterfrom
wip/3mdeb/freebsd-ci

Conversation

@Asiderr
Copy link
Collaborator

@Asiderr Asiderr commented May 20, 2021

Signed-off-by: Norbert Kamiński norbert.kaminski@3mdeb.com
Signed-off-by: Piotr Konkol piotr.konkol@3mdeb.com

Related to: #3031

Type of pull request:

@Asiderr Asiderr mentioned this pull request May 20, 2021
4 tasks
@Asiderr Asiderr force-pushed the wip/3mdeb/freebsd-ci branch 3 times, most recently from 8ad049c to c4814f1 Compare May 21, 2021 11:52
@hughsie
Copy link
Member

hughsie commented May 21, 2021

@Asiderr do you want to do anything cleverer than in hughsie/libgusb#49 -- I think adding FreeBSD CI to our deps is probably a long term good plan.

@Asiderr
Copy link
Collaborator Author

Asiderr commented May 21, 2021

@hughsie currently, I'm testing those changes and I'll leave review/approval. After that, I need to focus on the USB reset problem (it's pretty urgent for us).

Copy link
Member

@superm1 superm1 left a comment

Choose a reason for hiding this comment

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

can this rebased now?

@Asiderr Asiderr force-pushed the wip/3mdeb/freebsd-ci branch 2 times, most recently from 4608f2f to cd5c8eb Compare May 31, 2021 13:28
@@ -0,0 +1,3 @@
TIMESTAMP = 1622115022
Copy link
Member

Choose a reason for hiding this comment

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

I don't see any sed into this file, does it need some?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

There is no need, it's overwritten during the build. make makesum generates distinfo for the current commit:
cd5c8eb#diff-bdce2284300df67bb504fd10f5eb71470dbe6d3c074ff78fc6ccaaf405e6e008R54

Copy link
Member

Choose a reason for hiding this comment

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

Then perhaps just drop the file alltogether if it's generated during make command.

Copy link
Member

@superm1 superm1 left a comment

Choose a reason for hiding this comment

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

I think as part of the addition of this job, the other freebsd built job can be removed. We don't need both.

@Asiderr Asiderr force-pushed the wip/3mdeb/freebsd-ci branch 3 times, most recently from 4ea3dd9 to dd9d512 Compare May 31, 2021 14:00
Signed-off-by: Norbert Kamiński <norbert.kaminski@3mdeb.com>
@Asiderr Asiderr force-pushed the wip/3mdeb/freebsd-ci branch from dd9d512 to ff46b26 Compare May 31, 2021 14:18
@Asiderr Asiderr force-pushed the wip/3mdeb/freebsd-ci branch 4 times, most recently from 5f24195 to 896cf61 Compare June 1, 2021 07:59
@hughsie
Copy link
Member

hughsie commented Jun 4, 2021

Looks good to me, @superm1 any changes you wanted to see before we merge?

@superm1
Copy link
Member

superm1 commented Jun 4, 2021

Looks good to me, @superm1 any changes you wanted to see before we merge?

Just drop contrib/freebsd/distinfo and then it's good to me.

pkg install -y meson
pkg upgrade -y meson
cd /usr
git clone https://github.com/3mdeb/freebsd-ports.git --depth 1 -b fwupd ports
Copy link
Member

Choose a reason for hiding this comment

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

this bit does worry me slightly; can't we get this from freebsd upstream? Ideally this would all be self contained.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

It will be changed to the upstream repo when fwupd and its dependencies will come into freebsd-ports.

Signed-off-by: Norbert Kamiński <norbert.kaminski@3mdeb.com>
@Asiderr Asiderr force-pushed the wip/3mdeb/freebsd-ci branch from c1cd306 to dc3b9ba Compare June 5, 2021 10:55
@Asiderr
Copy link
Collaborator Author

Asiderr commented Jun 5, 2021

@superm1 @hughsie I droped distinfo and now we are generating the plist file in the runtime. If it's not generated, artifact does not install the files.

@superm1 superm1 merged commit dbece57 into master Jun 5, 2021
@hughsie hughsie deleted the wip/3mdeb/freebsd-ci branch June 9, 2021 14:28
@Whissi
Copy link
Contributor

Whissi commented Jun 15, 2021

This is causing a regression for us, Gentoo: https://bugs.gentoo.org/796143

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants