diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml index 9c4f958ad..1b351ef5d 100644 --- a/.github/workflows/Build.yml +++ b/.github/workflows/Build.yml @@ -70,13 +70,10 @@ jobs: run: | git config user.name "${{ github.actor }}" git config user.email "${{ github.actor }}@users.noreply.github.com" - git pull --rebase origin master - git push -f - - name: Push rebase changes - uses: ad-m/github-push-action@master - with: - branch: ${{ inputs.branch || github.ref_name }} - force: true + # git pull --rebase origin master + git pull + git rebase -X master ${{ inputs.branch || github.ref_name }} + git push --force-with-lease - name: Set Timestamp id: set-timestamp run: | @@ -85,12 +82,13 @@ jobs: echo "TIMESTAMP=${TIMESTAMP}" >> "$GITHUB_OUTPUT" - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v46 + uses: tj-actions/changed-files@v47 with: base_sha: master files_yaml: | packages: - packages/*.rb + since_last_remote_commit: true - name: Export variables to github context id: changed-packages run: | diff --git a/.github/workflows/Generate-PR.yml b/.github/workflows/Generate-PR.yml index 05bfc104d..cb611e4ac 100644 --- a/.github/workflows/Generate-PR.yml +++ b/.github/workflows/Generate-PR.yml @@ -71,22 +71,20 @@ jobs: run: | git config user.name "${{ github.actor }}" git config user.email "${{ github.actor }}@users.noreply.github.com" - git pull --rebase origin master - git push -f - - name: Push rebase changes - if: ${{ ( inputs.rebase ) }} - uses: ad-m/github-push-action@master - with: - branch: ${{ inputs.branch || github.ref_name }} - force: true + # git pull --rebase origin master + # git push -f + git pull + git rebase -X master ${{ inputs.branch || github.ref_name }} + git push --force-with-lease - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v46 + uses: tj-actions/changed-files@v47 with: base_sha: master files_yaml: | packages: - packages/*.rb + since_last_remote_commit: true - name: Export variables to github context id: changed-packages run: | @@ -343,7 +341,10 @@ jobs: git checkout "${{ inputs.branch || github.ref_name }}" if [[ ${REBASE} == 'true' ]]; then git reset --hard "origin/${{ inputs.branch || github.ref_name }}" - git pull --rebase origin master && git push -f + git pull + git rebase -X master ${{ inputs.branch || github.ref_name }} + git push --force-with-lease + # git pull --rebase origin master && git push -f fi git log --oneline -10 git checkout master && git pull @@ -351,7 +352,7 @@ jobs: git checkout "${{ inputs.branch || github.ref_name }}" - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v46 + uses: tj-actions/changed-files@v47 with: base_sha: master files_yaml: | @@ -366,6 +367,7 @@ jobs: - '!manifest/**' - '!packages/*.rb' - '!.github/**' + since_last_remote_commit: true - name: Get GH Token id: get_workflow_token uses: peter-murray/workflow-application-token-action@v4 diff --git a/.github/workflows/Linter-Handoff.yml b/.github/workflows/Linter-Handoff.yml index 150bf62ea..90927b265 100644 --- a/.github/workflows/Linter-Handoff.yml +++ b/.github/workflows/Linter-Handoff.yml @@ -44,7 +44,9 @@ jobs: git reset --hard "origin/${{ github.ref_name }}" - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v46 + uses: tj-actions/changed-files@v47 + with: + since_last_remote_commit: true - name: Get extensions of changed files id: changed-file-extensions run: | diff --git a/.github/workflows/No-Compile-Needed.yml b/.github/workflows/No-Compile-Needed.yml index 670862d6e..d63545cc9 100644 --- a/.github/workflows/No-Compile-Needed.yml +++ b/.github/workflows/No-Compile-Needed.yml @@ -75,12 +75,13 @@ jobs: echo "TIMESTAMP=${TIMESTAMP}" >> "$GITHUB_OUTPUT" - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v46 + uses: tj-actions/changed-files@v47 with: base_sha: master files_yaml: | packages: - packages/*.rb + since_last_remote_commit: true - name: Export variables to github context id: changed-packages run: | @@ -343,7 +344,7 @@ jobs: git checkout "${{ inputs.branch || github.ref_name }}" - name: Get changed files id: changed-files - uses: tj-actions/changed-files@v46 + uses: tj-actions/changed-files@v47 with: base_sha: master files_yaml: | @@ -358,6 +359,7 @@ jobs: - '!manifest/**' - '!packages/*.rb' - '!.github/**' + since_last_remote_commit: true - name: Get GH Token id: get_workflow_token uses: peter-murray/workflow-application-token-action@v4 diff --git a/.github/workflows/Unit-Test.yml b/.github/workflows/Unit-Test.yml index 5b25308d1..b8879cc4b 100644 --- a/.github/workflows/Unit-Test.yml +++ b/.github/workflows/Unit-Test.yml @@ -66,7 +66,7 @@ jobs: run: echo "$MATRIX_CONTEXT" - name: Get non-pkg changed files id: non-pkg-changed-files - uses: tj-actions/changed-files@v46 + uses: tj-actions/changed-files@v47 with: files_ignore: | .github/** @@ -76,9 +76,10 @@ jobs: tools/repology.json - name: Get all changed package files id: changed-ruby-files - uses: tj-actions/changed-files@v46 + uses: tj-actions/changed-files@v47 with: files: packages/*.rb + since_last_remote_commit: true - name: Export variables to github context run: | # Convert "packages/foo.rb packages/bar.rb" (from steps.changed-ruby-files.outputs.all_changed_files) into "foo bar" diff --git a/manifest/armv7l/p/py3_meson.filelist b/manifest/armv7l/p/py3_meson.filelist index da70fd4f3..a1fda0017 100644 --- a/manifest/armv7l/p/py3_meson.filelist +++ b/manifest/armv7l/p/py3_meson.filelist @@ -1,13 +1,13 @@ -# Total size: 8945875 +# Total size: 8951715 /usr/local/bin/meson -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/INSTALLER -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/METADATA -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/RECORD -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/REQUESTED -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/WHEEL -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/entry_points.txt -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/licenses/COPYING -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/top_level.txt +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/INSTALLER +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/METADATA +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/RECORD +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/REQUESTED +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/WHEEL +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/entry_points.txt +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/licenses/COPYING +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/top_level.txt /usr/local/lib/python3.13/site-packages/mesonbuild/__init__.py /usr/local/lib/python3.13/site-packages/mesonbuild/__pycache__/__init__.cpython-313.pyc /usr/local/lib/python3.13/site-packages/mesonbuild/__pycache__/_pathlib.cpython-313.pyc diff --git a/manifest/i686/p/py3_meson.filelist b/manifest/i686/p/py3_meson.filelist index da70fd4f3..a1fda0017 100644 --- a/manifest/i686/p/py3_meson.filelist +++ b/manifest/i686/p/py3_meson.filelist @@ -1,13 +1,13 @@ -# Total size: 8945875 +# Total size: 8951715 /usr/local/bin/meson -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/INSTALLER -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/METADATA -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/RECORD -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/REQUESTED -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/WHEEL -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/entry_points.txt -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/licenses/COPYING -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/top_level.txt +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/INSTALLER +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/METADATA +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/RECORD +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/REQUESTED +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/WHEEL +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/entry_points.txt +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/licenses/COPYING +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/top_level.txt /usr/local/lib/python3.13/site-packages/mesonbuild/__init__.py /usr/local/lib/python3.13/site-packages/mesonbuild/__pycache__/__init__.cpython-313.pyc /usr/local/lib/python3.13/site-packages/mesonbuild/__pycache__/_pathlib.cpython-313.pyc diff --git a/manifest/x86_64/p/py3_meson.filelist b/manifest/x86_64/p/py3_meson.filelist index da70fd4f3..a1fda0017 100644 --- a/manifest/x86_64/p/py3_meson.filelist +++ b/manifest/x86_64/p/py3_meson.filelist @@ -1,13 +1,13 @@ -# Total size: 8945875 +# Total size: 8951715 /usr/local/bin/meson -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/INSTALLER -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/METADATA -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/RECORD -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/REQUESTED -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/WHEEL -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/entry_points.txt -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/licenses/COPYING -/usr/local/lib/python3.13/site-packages/meson-1.9.0.dist-info/top_level.txt +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/INSTALLER +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/METADATA +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/RECORD +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/REQUESTED +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/WHEEL +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/entry_points.txt +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/licenses/COPYING +/usr/local/lib/python3.13/site-packages/meson-1.9.1.dist-info/top_level.txt /usr/local/lib/python3.13/site-packages/mesonbuild/__init__.py /usr/local/lib/python3.13/site-packages/mesonbuild/__pycache__/__init__.cpython-313.pyc /usr/local/lib/python3.13/site-packages/mesonbuild/__pycache__/_pathlib.cpython-313.pyc diff --git a/packages/py3_meson.rb b/packages/py3_meson.rb index aca2b688d..27175f04e 100644 --- a/packages/py3_meson.rb +++ b/packages/py3_meson.rb @@ -3,17 +3,17 @@ require 'buildsystems/pip' class Py3_meson < Pip description 'Meson is an open source build system meant to be both extremely fast and user friendly.' homepage 'https://mesonbuild.com/' - version "1.9.0-#{CREW_PY_VER}" + version "1.9.1-#{CREW_PY_VER}" license 'Apache-2.0' compatibility 'all' source_url 'SKIP' binary_compression 'tar.zst' binary_sha256({ - aarch64: '824b33919f3aa1a40826286db15df2242cbc4646423a9dcb04ca17d0e863d53d', - armv7l: '824b33919f3aa1a40826286db15df2242cbc4646423a9dcb04ca17d0e863d53d', - i686: '6fcd0eb465bbf569b57314d49064c9dabb6738bf4be273171c4aec167886b58b', - x86_64: '89c5d4d7131d4db384363ac5c3c1a7cc482f3f6baf93a05a606a686a68f42585' + aarch64: '1de6301daf7e5604f1462ac1a6b65636f219affe1f2131fec164fbf9f5ff34a1', + armv7l: '1de6301daf7e5604f1462ac1a6b65636f219affe1f2131fec164fbf9f5ff34a1', + i686: 'd43944bed00e6500834d400e6193527ebbe2a98034a478735b0f5a2af67ab68a', + x86_64: 'ea4d01614dc8e9a1ffa01b7e73b2bfa696c1ca2b42ceda186f67e6517a720fcf' }) depends_on 'ninja'