mirror of
https://github.com/chromebrew/chromebrew.git
synced 2026-01-09 23:48:01 -05:00
Cleanup version debug output, move pr generation final step to arm runner. (#13586)
* Cleanup version debug output, move pr generation final step to arm runner. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Add manual gem installs. Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Adjust changed-files base_sha Signed-off-by: Satadru Pramanik <satadru@gmail.com> * Adjust changed_package logic in workflow. Signed-off-by: Satadru Pramanik <satadru@gmail.com> --------- Signed-off-by: Satadru Pramanik <satadru@gmail.com> Co-authored-by: Satadru Pramanik <satadru@gmail.com>
This commit is contained in:
chromebrew-actions[bot]
committed by
GitHub
GitHub
parent
3ed6f181c5
commit
47fddb5456
25
.github/workflows/Generate-PR.yml
vendored
25
.github/workflows/Generate-PR.yml
vendored
@@ -375,12 +375,13 @@ jobs:
|
||||
git log --oneline -10
|
||||
fi
|
||||
build-check:
|
||||
runs-on: ubuntu-24.04
|
||||
runs-on: ubuntu-24.04-arm
|
||||
needs:
|
||||
- setup
|
||||
- update-package-files
|
||||
if: ${{ ( always() && !cancelled() ) && needs.setup.result == 'success' && ((( inputs.update_package_files ) && needs.update-package-files.result == 'success') || !( inputs.update_package_files )) }}
|
||||
outputs:
|
||||
changed_packages: ${{ steps.changed-packages.outputs.CHANGED_PACKAGES }}
|
||||
current_head: ${{ steps.get-current-head.outputs.CURRENT_HEAD }}
|
||||
steps:
|
||||
- name: Fail if update or build jobs failed, otherwise create a PR
|
||||
@@ -443,7 +444,7 @@ jobs:
|
||||
id: changed-files
|
||||
uses: tj-actions/changed-files@v47
|
||||
with:
|
||||
base_sha: ${{ steps.get-current-head.outputs.CURRENT_HEAD }}
|
||||
base_sha: ${{ github.event.pull_request.head.sha }}
|
||||
files_yaml: |
|
||||
manifest:
|
||||
- manifest/**
|
||||
@@ -456,12 +457,24 @@ jobs:
|
||||
- '!manifest/**'
|
||||
- '!packages/*.rb'
|
||||
- '!.github/**'
|
||||
- name: Export variables to github context
|
||||
id: changed-packages
|
||||
env:
|
||||
CHANGED_FILES: ${{ steps.changed-files.outputs.packages_all_changed_files }}
|
||||
run: |
|
||||
if [[ -n "${CHANGED_FILES}" ]]; then
|
||||
# Convert "packages/foo.rb packages/bar.rb" (from steps.changed-files.outputs.packages_all_changed_files) into "foo bar"
|
||||
echo "CHANGED_PACKAGES=$(echo "${CHANGED_FILES}" | xargs basename -s .rb | xargs)" >> "$GITHUB_ENV"
|
||||
echo "CHANGED_PACKAGES=$(echo "${CHANGED_FILES}" | xargs basename -s .rb | xargs)" >> "$GITHUB_OUTPUT"
|
||||
else
|
||||
echo "No Changed Files."
|
||||
fi
|
||||
- name: Create Pull Request
|
||||
env:
|
||||
CHANGED_GITHUB_CONFIG_FILES: ${{ steps.changed-files.outputs.github_all_changed_files }}
|
||||
CHANGED_MANIFEST_FILES: ${{ steps.changed-files.outputs.manifest_all_changed_files }}
|
||||
CHANGED_OTHER_FILES: ${{ steps.changed-files.outputs.other_all_changed_files }}
|
||||
CHANGED_PACKAGES: ${{ needs.setup.outputs.changed_packages }}
|
||||
CHANGED_PACKAGES: ${{ steps.changed-packages.outputs.CHANGED_PACKAGES }}
|
||||
CREW_BRANCH: ${{ inputs.branch || github.ref_name }}
|
||||
DRAFT_PR: ${{ inputs.draft_pr }}
|
||||
GH_TOKEN: ${{ steps.get_workflow_token.outputs.token }}
|
||||
@@ -473,7 +486,13 @@ jobs:
|
||||
run: |
|
||||
# Make untouched clone of repo so we can get the existing versions of packages.
|
||||
(cd /tmp ; git clone --depth=1 https://github.com/${{ github.repository }}.git chromebrew_main )
|
||||
sudo gem install -N json --conservative
|
||||
sudo gem install -N ptools --conservative
|
||||
sudo gem install -N highline --conservative
|
||||
sudo gem install -N concurrent-ruby --conservative
|
||||
sudo gem install -N method_source --conservative
|
||||
sudo gem install -N cgi --conservative
|
||||
sudo gem install -N ruby-libversion --conservative
|
||||
# Make crew do automatic gem installs before looking for deps.
|
||||
LD_LIBRARY_PATH=/usr/local/lib ruby bin/crew version
|
||||
# Force creation of temporary device.json.
|
||||
|
||||
4
.github/workflows/Unit-Test.yml
vendored
4
.github/workflows/Unit-Test.yml
vendored
@@ -84,6 +84,7 @@ jobs:
|
||||
id: non-pkg-changed-files
|
||||
uses: tj-actions/changed-files@v47
|
||||
with:
|
||||
base_sha: ${{ github.event.pull_request.head.sha }}
|
||||
files_ignore: |
|
||||
.github/**
|
||||
manifest/**
|
||||
@@ -94,6 +95,7 @@ jobs:
|
||||
id: changed-ruby-files
|
||||
uses: tj-actions/changed-files@v47
|
||||
with:
|
||||
base_sha: ${{ github.event.pull_request.head.sha }}
|
||||
files: packages/*.rb
|
||||
since_last_remote_commit: true
|
||||
- name: Export variables to github context
|
||||
@@ -228,7 +230,7 @@ jobs:
|
||||
/bin/chromebrewstart /usr/local/lib/crew/tests/unit_test_stub.sh
|
||||
fi
|
||||
container_test_check:
|
||||
runs-on: ubuntu-24.04
|
||||
runs-on: ubuntu-24.04-arm
|
||||
needs:
|
||||
- container_tests
|
||||
if: ${{ !cancelled() }}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
#!/usr/bin/env ruby
|
||||
# version.rb version 3.14 (for Chromebrew)
|
||||
# version.rb version 3.15 (for Chromebrew)
|
||||
|
||||
OPTIONS = %w[-h --help -j --json -u --update-package-files -v --verbose -vv]
|
||||
|
||||
@@ -413,11 +413,13 @@ if filelist.length.positive?
|
||||
versions_updated[@pkg.name.to_sym] = 'Not Found.' if upstream_version.nil? || upstream_version.to_s.chomp == 'null'
|
||||
|
||||
unless upstream_version.nil?
|
||||
crewlog "PackageUtils.get_clean_version(@pkg.version): #{PackageUtils.get_clean_version(@pkg.version)}"
|
||||
crewlog "upstream_version: #{upstream_version}"
|
||||
crewlog "Libversion.version_compare2(PackageUtils.get_clean_version(@pkg.version), upstream_version): #{Libversion.version_compare2(PackageUtils.get_clean_version(@pkg.version), upstream_version)}"
|
||||
crewlog "Libversion.version_compare2(PackageUtils.get_clean_version(@pkg.version), upstream_version) >= 0: #{Libversion.version_compare2(PackageUtils.get_clean_version(@pkg.version), upstream_version) >= 0}"
|
||||
crewlog "versions_updated[@pkg.name.to_sym] != 'Not Found.': #{versions_updated[@pkg.name.to_sym] != 'Not Found.'}"
|
||||
if versions_updated[@pkg.name.to_sym] != 'Not Found.'
|
||||
crewlog "PackageUtils.get_clean_version(@pkg.version): #{PackageUtils.get_clean_version(@pkg.version)}"
|
||||
crewlog "upstream_version: #{upstream_version}"
|
||||
crewlog "Libversion.version_compare2(PackageUtils.get_clean_version(@pkg.version), upstream_version): #{Libversion.version_compare2(PackageUtils.get_clean_version(@pkg.version), upstream_version)}"
|
||||
crewlog "Libversion.version_compare2(PackageUtils.get_clean_version(@pkg.version), upstream_version) >= 0: #{Libversion.version_compare2(PackageUtils.get_clean_version(@pkg.version), upstream_version) >= 0}"
|
||||
crewlog "versions_updated[@pkg.name.to_sym] != 'Not Found.': #{versions_updated[@pkg.name.to_sym] != 'Not Found.'}"
|
||||
end
|
||||
versions_updated[@pkg.name.to_sym] = 'Up to date.' if (Libversion.version_compare2(PackageUtils.get_clean_version(@pkg.version), upstream_version) >= 0) && versions_updated[@pkg.name.to_sym] != 'Not Found.'
|
||||
if Libversion.version_compare2(PackageUtils.get_clean_version(@pkg.version), upstream_version) == -1
|
||||
if UPDATE_PACKAGE_FILES && !@pkg.name[/#{CREW_AUTOMATIC_VERSION_UPDATE_EXCLUSION_REGEX}/] && updatable_pkg[@pkg.name.to_sym] == 'Yes'
|
||||
|
||||
Reference in New Issue
Block a user