Skip to content

Commit 05961c0

Browse files
authored
Merge pull request IvorySQL#711 from jiaoshuntian/macos_latest
Use macos latest in actions and config icu4c
2 parents 53828a0 + b2081f4 commit 05961c0

4 files changed

Lines changed: 16 additions & 12 deletions

File tree

.github/workflows/build.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
os: [ubuntu-latest, macos-12]
14+
os: [ubuntu-latest, macos-latest]
1515

1616
steps:
1717
- uses: actions/checkout@v3
@@ -35,9 +35,10 @@ jobs:
3535
--with-ossp-uuid --with-libxml --with-libxslt --with-perl \
3636
--with-icu
3737
- name: configure - macos
38-
if: ${{ matrix.os == 'macos-12' }}
38+
if: ${{ matrix.os == 'macos-latest' }}
3939
run: |
40-
export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
40+
brew install icu4c
41+
export PKG_CONFIG_PATH=$(brew --prefix)/opt/icu4c/lib/pkgconfig
4142
./configure \
4243
--enable-cassert --enable-debug --enable-rpath --with-tcl \
4344
--with-python --with-pam --with-ldap --with-libedit-preferred \

.github/workflows/oracle_pg_regression.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
os: [ubuntu-latest, macos-12]
14+
os: [ubuntu-latest, macos-latest]
1515

1616
steps:
1717
- uses: actions/checkout@v3
@@ -39,9 +39,10 @@ jobs:
3939
--with-ossp-uuid --with-libxml --with-libxslt --with-perl \
4040
--with-icu
4141
- name: configure - macos
42-
if: ${{ matrix.os == 'macos-12' }}
42+
if: ${{ matrix.os == 'macos-latest' }}
4343
run: |
44-
export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
44+
brew install icu4c
45+
export PKG_CONFIG_PATH=$(brew --prefix)/opt/icu4c/lib/pkgconfig
4546
curl -L -o cpanm http://cpanmin.us && chmod +x cpanm && \
4647
./cpanm --sudo IPC::Run && \
4748
./configure \

.github/workflows/oracle_regression.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
os: [ubuntu-latest, macos-12]
14+
os: [ubuntu-latest, macos-latest]
1515

1616
steps:
1717
- uses: actions/checkout@v3
@@ -39,9 +39,10 @@ jobs:
3939
--with-ossp-uuid --with-libxml --with-libxslt --with-perl \
4040
--with-icu
4141
- name: configure - macos
42-
if: ${{ matrix.os == 'macos-12' }}
42+
if: ${{ matrix.os == 'macos-latest' }}
4343
run: |
44-
export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
44+
brew install icu4c
45+
export PKG_CONFIG_PATH=$(brew --prefix)/opt/icu4c/lib/pkgconfig
4546
curl -L -o cpanm http://cpanmin.us && chmod +x cpanm && \
4647
./cpanm --sudo IPC::Run && \
4748
./configure \

.github/workflows/pg_regression.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
matrix:
14-
os: [ubuntu-latest, macos-12]
14+
os: [ubuntu-latest, macos-latest]
1515

1616
steps:
1717
- uses: actions/checkout@v3
@@ -39,9 +39,10 @@ jobs:
3939
--with-ossp-uuid --with-libxml --with-libxslt --with-perl \
4040
--with-icu
4141
- name: configure - macos
42-
if: ${{ matrix.os == 'macos-12' }}
42+
if: ${{ matrix.os == 'macos-latest' }}
4343
run: |
44-
export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
44+
brew install icu4c
45+
export PKG_CONFIG_PATH=$(brew --prefix)/opt/icu4c/lib/pkgconfig
4546
curl -L -o cpanm http://cpanmin.us && chmod +x cpanm && \
4647
./cpanm --sudo IPC::Run && \
4748
./configure \

0 commit comments

Comments
 (0)