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

Check updater.phar is up to date in check-same-code-base job #432

Merged
merged 2 commits into from Sep 1, 2022
Merged

Check updater.phar is up to date in check-same-code-base job #432

merged 2 commits into from Sep 1, 2022

Conversation

come-nc
Copy link
Collaborator

@come-nc come-nc commented Sep 1, 2022 •
edited

Fix #414

Signed-off-by: Côme Chilliet come.chilliet@nextcloud.com

@come-nc
Check updater.phar is up to date in check-same-code-base job
77e054e 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc self-assigned this Sep 1, 2022
@come-nc come-nc force-pushed the fix/add-workflow-updater-phar branch 4 times, most recently from ea3b1fb to 47d6b27 Compare September 1, 2022 10:02
@come-nc
Copy link
Collaborator Author

come-nc commented Sep 1, 2022

Hum this is hard.
The phar build creates a lib/Version.php file which contain a version created with git describe --tags
This returns an empty string when run from the CI it seems, so the phar content always differs on lib/Version.php size, and total phar size.
So, I had to filter out both Version.php and global size from the diff.

Still better than nothing I suppose.

@come-nc
Compare content, not binary as the signature is different at each build
b190d12 
Had to exclude from diff:
- Signature which always differs
- lib/Version.php which depends upon git describe and is shorter in CI
- Content: line which contains global size, which depends upon lib/Version.php size

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc come-nc force-pushed the fix/add-workflow-updater-phar branch from 47d6b27 to b190d12 Compare September 1, 2022 10:05
@come-nc come-nc requested a review from blizzz September 1, 2022 10:07
@blizzz
Copy link
Member

blizzz commented Sep 1, 2022

Hum this is hard. The phar build creates a lib/Version.php file which contain a version created with git describe --tags This returns an empty string when run from the CI it seems, so the phar content always differs on lib/Version.php size, and total phar size. So, I had to filter out both Version.php and global size from the diff.

Still better than nothing I suppose.

Aye, this behaviour is unfortunate. Good that you found a way around it!

@blizzz blizzz merged commit e7915bc into master Sep 1, 2022
@blizzz blizzz deleted the fix/add-workflow-updater-phar branch September 1, 2022 11:33
@blizzz blizzz mentioned this pull request Sep 1, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@blizzz blizzz blizzz approved these changes

Assignees

@come-nc come-nc

Labels
3. to review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

add workflow check to verify updater.phar is up to date on a PR
2 participants
@come-nc @blizzz