Skip to content

Commit 3a03fa9

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 3dfe466 commit 3a03fa9

File tree

2 files changed

+13
-15
lines changed

2 files changed

+13
-15
lines changed

.github/workflows/linux-ci.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ jobs:
2828
download_requirements: brew install metis bash
2929
- os: macos-13
3030
build_static: false
31-
flags: CC=gcc-13 CXX=g++-13 OSX=13
31+
flags: CC=gcc-13 CXX=g++-13 OSX=13 ADD_CXXFLAGS=-Wl,-ld_classic
3232
download_requirements: brew install metis bash
3333
steps:
3434
- name: Checkout source
35-
uses: actions/checkout@v3
35+
uses: actions/checkout@v4
3636
with:
3737
path: ${{ github.event.repository.name }}
3838
- name: Install required packages from package manager
3939
run: ${{ matrix.download_requirements }}
4040
- name: Checkout coinbrew
41-
uses: actions/checkout@v3
41+
uses: actions/checkout@v4
4242
with:
4343
repository: coin-or/coinbrew
4444
path: coinbrew
@@ -65,7 +65,7 @@ jobs:
6565
cp ${{ github.event.repository.name }}/LICENSE dist/
6666
tar -czvf release.tar.gz -C dist .
6767
- name: Checkout package name generation script
68-
uses: actions/checkout@v3
68+
uses: actions/checkout@v4
6969
with:
7070
repository: coin-or-tools/platform-analysis-tools
7171
path: tools
@@ -80,13 +80,13 @@ jobs:
8080
echo "platform_string=${platform_str}" >> $GITHUB_ENV
8181
- name: Upload Artifact
8282
if: ${{ github.event_name == 'pull_request'}}
83-
uses: actions/upload-artifact@v3
83+
uses: actions/upload-artifact@v4
8484
with:
85-
name: ${{ github.event.repository.name }}-${{ github.head_ref }}-${{ env.platform_string }}.tar.gz
85+
name: ${{ github.event.repository.name }}-${{ env.platform_string }}.tar.gz
8686
path: release.tar.gz
8787
if-no-files-found: error
8888
- name: Upload package to release
89-
if: github.event_name == 'release' && github.include.arch != 'arm64'
89+
if: ${{ github.event_name == 'release'}}
9090
uses: actions/upload-release-asset@v1
9191
env:
9292
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/windows-ci.yml

Lines changed: 6 additions & 8 deletions
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: |
@@ -112,7 +110,7 @@ jobs:
112110
cp ${{ github.event.repository.name }}/LICENSE dist/
113111
shell: msys2 {0}
114112
- name: Upload failed build directory
115-
uses: actions/upload-artifact@v3
113+
uses: actions/upload-artifact@v4
116114
if: failure()
117115
with:
118116
name: ${{ matrix.os}}-{{ matrix.arch }}-debug=${{ matrix.debug }}-failedbuild
@@ -130,9 +128,9 @@ jobs:
130128
if: ${{ matrix.arch != 'msvc' }}
131129
- name: Upload artifact
132130
if: ${{ github.event_name == 'pull_request'}}
133-
uses: actions/upload-artifact@v3
131+
uses: actions/upload-artifact@v4
134132
with:
135-
name: ${{ github.event.repository.name }}-${{ github.head_ref }}-${{ env.package_suffix }}
133+
name: ${{ github.event.repository.name }}-${{ env.package_suffix }}
136134
path: dist
137135
if-no-files-found: error
138136
- name: Zip up dist contents for release

0 commit comments

Comments
 (0)