Skip to content

Commit 29b0bb8

Browse files
committed
Update linux-ci and windows-ci for outdated actions and build issues
For linux-ci, update actions and macos-13 linker error See coin-or/COIN-OR-OptimizationSuite#26 For windows-ci, update actions and remove 32-bit builds via mingw32. See coin-or/COIN-OR-OptimizationSuite#25
1 parent 7985d2c commit 29b0bb8

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

.github/workflows/linux-ci.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ jobs:
2929
download_requirements: brew install metis bash
3030
- os: macos-13
3131
build_static: false
32-
flags: CC=gcc-13 CXX=g++-13 OSX=13
32+
flags: CC=gcc-13 CXX=g++-13 OSX=13 ADD_CXXFLAGS=-Wl,-ld_classic
3333
download_requirements: brew install metis bash
3434
steps:
3535
- name: Checkout source
36-
uses: actions/checkout@v3
36+
uses: actions/checkout@v4
3737
with:
3838
path: ${{ github.event.repository.name }}
3939
- name: Install required packages from package manager
4040
run: ${{ matrix.download_requirements }}
4141
- name: Checkout coinbrew
42-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
4343
with:
4444
repository: coin-or/coinbrew
4545
path: coinbrew
@@ -66,7 +66,7 @@ jobs:
6666
cp ${{ github.event.repository.name }}/LICENSE dist/
6767
tar -czvf release.tar.gz -C dist .
6868
- name: Checkout package name generation script
69-
uses: actions/checkout@v3
69+
uses: actions/checkout@v4
7070
with:
7171
repository: coin-or-tools/platform-analysis-tools
7272
path: tools
@@ -81,9 +81,9 @@ jobs:
8181
echo "platform_string=${platform_str}" >> $GITHUB_ENV
8282
- name: Upload Artifact
8383
if: ${{ github.event_name == 'pull_request'}}
84-
uses: actions/upload-artifact@v3
84+
uses: actions/upload-artifact@v4
8585
with:
86-
name: ${{ github.event.repository.name }}-${{ github.head_ref }}-${{ env.platform_string }}.tar.gz
86+
name: ${{ github.event.repository.name }}-${{ env.platform_string }}.tar.gz
8787
path: release.tar.gz
8888
if-no-files-found: error
8989
- name: Upload package to release

.github/workflows/windows-ci.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,17 @@ jobs:
2222
include: [
2323
{ os: windows-2019, arch: x86_64, msystem: mingw64, debug: true, suffix: "-dbg" },
2424
{ os: windows-2019, arch: x86_64, msystem: mingw64, debug: false, suffix: "" },
25-
{ os: windows-2019, arch: i686, msystem: mingw32, debug: true, suffix: "-dbg" },
26-
{ os: windows-2019, arch: i686, msystem: mingw32, debug: false, suffix: "" },
2725
{ os: windows-2019, arch: msvc, msystem: mingw64, debug: false, suffix: "-md" },
2826
{ os: windows-2022, arch: msvc, msystem: mingw64, debug: false, suffix: "-md" },
2927
{ os: windows-2022, arch: msvs, msystem: mingw64, debug: false, suffix: "" },
3028
]
3129
steps:
3230
- name: Checkout source
33-
uses: actions/checkout@v3
31+
uses: actions/checkout@v4
3432
with:
3533
path: ${{ github.event.repository.name }}
3634
- name: Checkout coinbrew
37-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3836
with:
3937
repository: coin-or/coinbrew
4038
path: coinbrew
@@ -43,7 +41,7 @@ jobs:
4341
uses: ilammy/msvc-dev-cmd@v1
4442
- name: Set up for msvs
4543
if: ${{ matrix.arch == 'msvs' }}
46-
uses: microsoft/setup-msbuild@v1.1
44+
uses: microsoft/setup-msbuild@v2
4745
- name: Set correct host flag and install requirements
4846
if: ${{ matrix.arch != 'msvc' && matrix.arch != 'msvs' }}
4947
run: |
@@ -115,7 +113,7 @@ jobs:
115113
cp ${{ github.event.repository.name }}/LICENSE dist/
116114
shell: msys2 {0}
117115
- name: Upload failed build directory
118-
uses: actions/upload-artifact@v3
116+
uses: actions/upload-artifact@v4
119117
if: failure()
120118
with:
121119
name: ${{ matrix.os}}-{{ matrix.arch }}-debug=${{ matrix.debug }}-failedbuild
@@ -133,9 +131,9 @@ jobs:
133131
if: ${{ matrix.arch != 'msvc' }}
134132
- name: Upload artifact
135133
if: ${{ github.event_name == 'pull_request'}}
136-
uses: actions/upload-artifact@v3
134+
uses: actions/upload-artifact@v4
137135
with:
138-
name: ${{ github.event.repository.name }}-${{ github.head_ref }}-${{ env.package_suffix }}
136+
name: ${{ github.event.repository.name }}-${{ env.package_suffix }}
139137
path: dist
140138
if-no-files-found: error
141139
- name: Zip up dist contents for release

0 commit comments

Comments
 (0)