Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into Ractor-Local-GC-v…
Browse files Browse the repository at this point in the history
…ersion-1
  • Loading branch information
rm155 committed Aug 2, 2023
2 parents 65b4cc2 + a502cd8 commit 4f15f5e
Show file tree
Hide file tree
Showing 51 changed files with 631 additions and 717 deletions.
1 change: 0 additions & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ env:
INIT_ENV:

config_template: &CONFIG_TEMPLATE
auto_cancellation: $CIRRUS_BRANCH != 'master'
only_if: changesInclude('.cirrus.yml', 'yjit.{c,h,rb}', 'yjit/**.{mk,rs,toml}')
skip: >-
$CIRRUS_CHANGE_MESSAGE =~ '.*\[DOC\].*' ||
Expand Down
22 changes: 14 additions & 8 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ jobs:

env:
GITPULLOPTIONS: --no-tags origin ${{ github.ref }}
PATCH: C:\msys64\usr\bin\patch.exe
OS_VER: windows-${{ matrix.vs < 2022 && '2019' || matrix.vs }}
# FIXME: This is a workaround for the vcpkg's issue present as of openssl 3.1.1
# where OpenSSL's default modules directory is incorrectly set to C:\vcpkg\packages\openssl_x64-windows\bin
Expand All @@ -62,18 +61,25 @@ jobs:
- run: md build
working-directory:

- name: find tools
id: find-tools
run: |
::- find needed tools
set NEEDS=
for %%I in (patch.exe) do if "%%~$PATH:I" == "" (
echo NEEDS=%NEEDS% %%I
) else (
echo %%I: %%~$PATH:I
)
echo needs=%NEEDS% >> %GITHUB_OUTPUT%
- uses: msys2/setup-msys2@d40200dc2db4c351366b048a9565ad82919e1c24 # v2
id: setup-msys2
with:
update: true
install: >-
patch
if: ${{ env.OS_VER != 'windows-2019' }}

- name: patch path
shell: msys2 {0}
run: echo PATCH=$(cygpath -wa $(command -v patch)) >> $GITHUB_ENV
if: ${{ steps.setup-msys2.outcome == 'success' }}
${{ steps.find-patch.outputs.needs }}
if: ${{ steps.find-patch.outputs.needs != '' }}

- uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
with:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/yjit-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ jobs:
TEST_BUNDLED_GEMS_ALLOW_FAILURES: ''
PRECHECK_BUNDLED_GEMS: 'no'
SYNTAX_SUGGEST_TIMEOUT: '5'
YJIT_BINDGEN_DIFF_OPTS: '--exit-code'
continue-on-error: ${{ matrix.test_task == 'yjit-bench' }}

- name: Show ${{ github.event.pull_request.base.ref }} GitHub URL for yjit-bench comparison
Expand Down
1 change: 1 addition & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -154,3 +154,4 @@ changelog for details of the default gems or bundled gems.
[Feature #19521]: https://bugs.ruby-lang.org/issues/19521
[Feature #19538]: https://bugs.ruby-lang.org/issues/19538
[Feature #19591]: https://bugs.ruby-lang.org/issues/19591
[Feature #19714]: https://bugs.ruby-lang.org/issues/19714
Loading

0 comments on commit 4f15f5e

Please sign in to comment.