diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 7a1e66d74..4bbd48196 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -285,9 +285,9 @@ jobs: if [ -n "$(git status --porcelain)" ]; then git config user.name "${{ github.actor }}" git config user.email "${{ github.actor }}@users.noreply.github.com" - git stash + git stash || true git pull - git stash pop + git stash pop || true git add -A git commit -m "${{ inputs.branch || github.ref_name }}: Build Run on ${PLATFORM}." && git push git log --oneline -10 @@ -434,9 +434,9 @@ jobs: if [ -n "$(git status --porcelain)" ]; then git config user.name "${{ github.actor }}" git config user.email "${{ github.actor }}@users.noreply.github.com" - git stash + git stash || true git pull - git stash pop + git stash pop || true git add -A git commit -m "${{ inputs.branch || github.ref_name }}: Package File Update Run on ${PLATFORM} container." && git push git log --oneline -10 diff --git a/.github/workflows/Generate-PR.yml b/.github/workflows/Generate-PR.yml index f3a23ff73..44b24fd5f 100644 --- a/.github/workflows/Generate-PR.yml +++ b/.github/workflows/Generate-PR.yml @@ -273,9 +273,9 @@ jobs: if [ -n "$(git status --porcelain)" ]; then git config user.name "${{ github.actor }}" git config user.email "${{ github.actor }}@users.noreply.github.com" - git stash + git stash || true git pull - git stash pop + git stash pop || true git add -A git commit -m "${{ inputs.branch || github.ref_name }}: Package File Update Run on ${PLATFORM} container." && git push git log --oneline -10 diff --git a/.github/workflows/No-Compile-Needed.yml b/.github/workflows/No-Compile-Needed.yml index 269ee86c5..5a6305e49 100644 --- a/.github/workflows/No-Compile-Needed.yml +++ b/.github/workflows/No-Compile-Needed.yml @@ -304,9 +304,9 @@ jobs: if [ -n "$(git status --porcelain)" ]; then git config user.name "${{ github.actor }}" git config user.email "${{ github.actor }}@users.noreply.github.com" - git stash + git stash || true git pull - git stash pop + git stash pop || true git add -A git commit -m "${{ inputs.branch || github.ref_name }}: Package File Update Run on ${PLATFORM} container." && git push git log --oneline -10 diff --git a/manifest/armv7l/r/ruby_jaro_winkler.filelist b/manifest/armv7l/r/ruby_jaro_winkler.filelist new file mode 100644 index 000000000..df0017121 --- /dev/null +++ b/manifest/armv7l/r/ruby_jaro_winkler.filelist @@ -0,0 +1,14 @@ +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-armv8l-linux-eabihf/LICENSE.txt +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-armv8l-linux-eabihf/ext/jaro_winkler/adj_matrix.c +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-armv8l-linux-eabihf/ext/jaro_winkler/adj_matrix.h +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-armv8l-linux-eabihf/ext/jaro_winkler/codepoints.c +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-armv8l-linux-eabihf/ext/jaro_winkler/codepoints.h +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-armv8l-linux-eabihf/ext/jaro_winkler/extconf.rb +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-armv8l-linux-eabihf/ext/jaro_winkler/jaro.c +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-armv8l-linux-eabihf/ext/jaro_winkler/jaro.h +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-armv8l-linux-eabihf/ext/jaro_winkler/jaro_winkler.c +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-armv8l-linux-eabihf/lib/jaro_winkler.rb +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-armv8l-linux-eabihf/lib/jaro_winkler/adjusting_table.rb +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-armv8l-linux-eabihf/lib/jaro_winkler/jaro_winkler_ext.so +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-armv8l-linux-eabihf/lib/jaro_winkler/jaro_winkler_pure.rb +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-armv8l-linux-eabihf/lib/jaro_winkler/version.rb diff --git a/manifest/i686/r/ruby_jaro_winkler.filelist b/manifest/i686/r/ruby_jaro_winkler.filelist new file mode 100644 index 000000000..e72294a57 --- /dev/null +++ b/manifest/i686/r/ruby_jaro_winkler.filelist @@ -0,0 +1,14 @@ +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86-linux/LICENSE.txt +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86-linux/ext/jaro_winkler/adj_matrix.c +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86-linux/ext/jaro_winkler/adj_matrix.h +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86-linux/ext/jaro_winkler/codepoints.c +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86-linux/ext/jaro_winkler/codepoints.h +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86-linux/ext/jaro_winkler/extconf.rb +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86-linux/ext/jaro_winkler/jaro.c +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86-linux/ext/jaro_winkler/jaro.h +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86-linux/ext/jaro_winkler/jaro_winkler.c +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86-linux/lib/jaro_winkler.rb +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86-linux/lib/jaro_winkler/adjusting_table.rb +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86-linux/lib/jaro_winkler/jaro_winkler_ext.so +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86-linux/lib/jaro_winkler/jaro_winkler_pure.rb +/usr/local/lib/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86-linux/lib/jaro_winkler/version.rb diff --git a/manifest/x86_64/r/ruby_jaro_winkler.filelist b/manifest/x86_64/r/ruby_jaro_winkler.filelist new file mode 100644 index 000000000..68234f1ef --- /dev/null +++ b/manifest/x86_64/r/ruby_jaro_winkler.filelist @@ -0,0 +1,14 @@ +/usr/local/lib64/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86_64-linux/LICENSE.txt +/usr/local/lib64/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86_64-linux/ext/jaro_winkler/adj_matrix.c +/usr/local/lib64/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86_64-linux/ext/jaro_winkler/adj_matrix.h +/usr/local/lib64/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86_64-linux/ext/jaro_winkler/codepoints.c +/usr/local/lib64/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86_64-linux/ext/jaro_winkler/codepoints.h +/usr/local/lib64/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86_64-linux/ext/jaro_winkler/extconf.rb +/usr/local/lib64/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86_64-linux/ext/jaro_winkler/jaro.c +/usr/local/lib64/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86_64-linux/ext/jaro_winkler/jaro.h +/usr/local/lib64/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86_64-linux/ext/jaro_winkler/jaro_winkler.c +/usr/local/lib64/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86_64-linux/lib/jaro_winkler.rb +/usr/local/lib64/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86_64-linux/lib/jaro_winkler/adjusting_table.rb +/usr/local/lib64/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86_64-linux/lib/jaro_winkler/jaro_winkler_ext.so +/usr/local/lib64/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86_64-linux/lib/jaro_winkler/jaro_winkler_pure.rb +/usr/local/lib64/ruby/gems/3.4.0/gems/jaro_winkler-1.6.1-x86_64-linux/lib/jaro_winkler/version.rb diff --git a/packages/ruby_jaro_winkler.rb b/packages/ruby_jaro_winkler.rb index de373bb3c..92f533e99 100644 --- a/packages/ruby_jaro_winkler.rb +++ b/packages/ruby_jaro_winkler.rb @@ -7,7 +7,15 @@ class Ruby_jaro_winkler < RUBY license 'MIT' compatibility 'all' source_url 'SKIP' + binary_compression 'gem' + + binary_sha256({ + aarch64: '344eabc608f000461c619e010ab1b4f0f88a0c3ed8308482f5747a00d0db01a2', + armv7l: '344eabc608f000461c619e010ab1b4f0f88a0c3ed8308482f5747a00d0db01a2', + i686: '13b35612d15b4fa1cdef5587937694a12ea99f7955f280f8e822a89bb3b5d048', + x86_64: 'fe2ca60b456afb8f32510f71cf55213b8e6774495c82bfbf5a4380b6a0bc2ab0' + }) conflicts_ok - no_compile_needed + gem_compile_needed end diff --git a/tools/build_updated_packages.rb b/tools/build_updated_packages.rb index 9d960d425..64e2c211b 100755 --- a/tools/build_updated_packages.rb +++ b/tools/build_updated_packages.rb @@ -1,5 +1,5 @@ #!/usr/local/bin/ruby -# build_updated_packages version 3.0 (for Chromebrew) +# build_updated_packages version 3.1 (for Chromebrew) # This updates the versions in python pip packages by calling # tools/update_python_pip_packages.rb, checks for updated ruby packages # by calling tools/update_ruby_gem_packages.rb, and then checks if any @@ -82,7 +82,7 @@ def update_hashes(name = nil) # Add build hashes. system "crew update_package_file #{name}" unless remote_binary.values.all?(nil) # Add manifests if we are in the right architecture. - FileUtils.cp "#{CREW_META_PATH}/#{name}.filelist", "#{CREW_LOCAL_REPO_ROOT}/manifest/#{ARCH}/#{name.chr}/#{name}.filelist" if system("yes | crew install #{name}") && File.exist?("#{CREW_META_PATH}/#{name}.filelist") + FileUtils.cp "#{CREW_META_PATH}/#{name}.filelist", "#{CREW_LOCAL_REPO_ROOT}/manifest/#{ARCH}/#{name.chr}/#{name}.filelist" if system("yes | crew reinstall #{name}") && File.exist?("#{CREW_META_PATH}/#{name}.filelist") end end