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.

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

Fix CI for ruby_2_7 branch #7259

Merged
merged 6 commits into from Mar 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 3 additions & 11 deletions .github/workflows/macos.yml
Expand Up @@ -19,17 +19,9 @@ jobs:
run: |
sudo /usr/libexec/ApplicationFirewall/socketfilterfw --setglobalstate off
sudo /usr/libexec/ApplicationFirewall/socketfilterfw --getglobalstate
# Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
- name: Checkout ruby
run: |
git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src
git -C src reset --hard "$GITHUB_SHA"
if: github.event_name == 'push'
- name: Checkout a pull request
run: |
git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src
git -C src reset --hard ${{ github.event.pull_request.head.sha }}
if: github.event_name == 'pull_request'
- uses: actions/checkout@v2
with:
path: src
- run: ./src/tool/actions-commit-info.sh
id: commit_info
- name: Install libraries
Expand Down
14 changes: 3 additions & 11 deletions .github/workflows/mjit.yml
Expand Up @@ -21,17 +21,9 @@ jobs:
set -x
sudo apt-get update -q || :
sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev bison autoconf ruby
# Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
- name: Checkout ruby
run: |
git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src
git -C src reset --hard "$GITHUB_SHA"
if: github.event_name == 'push'
- name: Checkout a pull request
run: |
git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src
git -C src reset --hard ${{ github.event.pull_request.head.sha }}
if: github.event_name == 'pull_request'
- uses: actions/checkout@v2
with:
path: src
- run: ./src/tool/actions-commit-info.sh
id: commit_info
- name: Fixed world writable dirs
Expand Down
16 changes: 4 additions & 12 deletions .github/workflows/ubuntu.yml
Expand Up @@ -11,7 +11,7 @@ jobs:
strategy:
matrix:
test_task: [ "check", "test-bundler", "test-bundled-gems" ]
os: [ubuntu-20.04, ubuntu-18.04]
os: [ubuntu-20.04]
exclude:
- test_task: test-bundler
os: ubuntu-16.04
Expand Down Expand Up @@ -52,17 +52,9 @@ jobs:
set -x
sudo apt-get update -q || :
sudo apt-get install --no-install-recommends -q -y build-essential libssl-dev libyaml-dev libreadline6-dev zlib1g-dev libncurses5-dev libffi-dev libgdbm-dev bison autoconf ruby
# Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
- name: Checkout ruby
run: |
git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src
git -C src reset --hard "$GITHUB_SHA"
if: github.event_name == 'push'
- name: Checkout a pull request
run: |
git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src
git -C src reset --hard ${{ github.event.pull_request.head.sha }}
if: github.event_name == 'pull_request'
- uses: actions/checkout@v2
with:
path: src
- run: ./src/tool/actions-commit-info.sh
id: commit_info
- name: Fixed world writable dirs
Expand Down
15 changes: 3 additions & 12 deletions .github/workflows/windows.yml
Expand Up @@ -37,18 +37,9 @@ jobs:
- name: Install libraries with chocolatey
run: |
choco install --no-progress openssl winflexbison3
# Not using official actions/checkout because it's unstable and sometimes doesn't work for a fork.
- name: Checkout ruby
run: |
git clone --single-branch --shallow-since=yesterday --branch=${GITHUB_REF#refs/heads/} https://github.com/${{ github.repository }} src
git -C src reset --hard ${{ github.sha }}
if: github.event_name == 'push'
shell: bash
- name: Checkout a pull request
run: |
git clone --single-branch --shallow-since=yesterday --branch=${{ github.event.pull_request.head.ref }} https://github.com/${{ github.event.pull_request.head.repo.full_name }} src
git -C src reset --hard ${{ github.event.pull_request.head.sha }}
if: github.event_name == 'pull_request'
- uses: actions/checkout@v2
with:
path: src
- run: ./src/tool/actions-commit-info.sh
shell: bash
id: commit_info
Expand Down
2 changes: 1 addition & 1 deletion test/ruby/test_time_tz.rb
Expand Up @@ -202,7 +202,7 @@ def test_europe_berlin

def test_europe_lisbon
with_tz("Europe/Lisbon") {
assert_equal("LMT", Time.new(-0x1_0000_0000_0000_0000).zone)
assert_include(%w"LMT CET", Time.new(-0x1_0000_0000_0000_0000).zone)
}
end if has_lisbon_tz

Expand Down