Skip to content

Commit 366f5ca

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 6851c99 commit 366f5ca

File tree

3 files changed

+30
-25
lines changed

3 files changed

+30
-25
lines changed

.github/workflows/linux-ci.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +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
33-
download_requirements: brew install metis bash
34-
- os: macos-13
35-
build_static: false
36-
flags: CC=clang OSX=13
32+
flags: CC=gcc-13 CXX=g++-13 OSX=13 ADD_CXXFLAGS=-Wl,-ld_classic
3733
download_requirements: brew install metis bash
3834
steps:
3935
- name: Checkout source
40-
uses: actions/checkout@v3
36+
uses: actions/checkout@v4
4137
with:
4238
path: ${{ github.event.repository.name }}
4339
- name: Install required packages from package manager
4440
run: ${{ matrix.download_requirements }}
4541
- name: Checkout coinbrew
46-
uses: actions/checkout@v3
42+
uses: actions/checkout@v4
4743
with:
4844
repository: coin-or/coinbrew
4945
path: coinbrew
@@ -70,7 +66,7 @@ jobs:
7066
cp ${{ github.event.repository.name }}/LICENSE dist/
7167
tar -czvf release.tar.gz -C dist .
7268
- name: Checkout package name generation script
73-
uses: actions/checkout@v3
69+
uses: actions/checkout@v4
7470
with:
7571
repository: coin-or-tools/platform-analysis-tools
7672
path: tools
@@ -85,9 +81,9 @@ jobs:
8581
echo "platform_string=${platform_str}" >> $GITHUB_ENV
8682
- name: Upload Artifact
8783
if: ${{ github.event_name == 'pull_request'}}
88-
uses: actions/upload-artifact@v3
84+
uses: actions/upload-artifact@v4
8985
with:
90-
name: ${{ github.event.repository.name }}-${{ github.head_ref }}-${{ env.platform_string }}.tar.gz
86+
name: ${{ github.event.repository.name }}-${{ env.platform_string }}.tar.gz
9187
path: release.tar.gz
9288
if-no-files-found: error
9389
- name: Upload package to release

.github/workflows/windows-ci.yml

Lines changed: 10 additions & 15 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: |
@@ -91,13 +89,10 @@ jobs:
9189
copy ${{ github.event.repository.name }}\LICENSE.* dist\.
9290
mkdir dist\bin
9391
copy ${{ github.event.repository.name }}\MSVisualStudio\v17\x64\Release\*.exe dist\bin\.
94-
mkdir dist\include\coin
95-
copy ${{ github.event.repository.name }}\src\*.h dist\include\coin\.
96-
copy ${{ github.event.repository.name }}\src\*.hpp dist\include\coin\.
97-
mkdir dist\lib
98-
copy ${{ github.event.repository.name }}\MSVisualStudio\v17\x64\Release\*.lib dist\lib\.
99-
mkdir dist\share\coin\Data
100-
xcopy Data dist\share\coin\Data\. /s /e
92+
mkdir dist\share
93+
if exist .\Data\Sample xcopy .\Data\Sample dist\share\coin-or-sample /i
94+
if exist .\Data\Netlib xcopy .\Data\Netlib dist\share\coin-or-netlib /i
95+
if exist .\Data\Miplib3 xcopy .\Data\Miplib3 dist\share\coin-or-miplib3 /i
10196
- name: Build project using coinbrew
10297
if: ${{ matrix.arch != 'msvs' }}
10398
run: |
@@ -115,7 +110,7 @@ jobs:
115110
cp ${{ github.event.repository.name }}/LICENSE dist/
116111
shell: msys2 {0}
117112
- name: Upload failed build directory
118-
uses: actions/upload-artifact@v3
113+
uses: actions/upload-artifact@v4
119114
if: failure()
120115
with:
121116
name: ${{ matrix.os}}-{{ matrix.arch }}-debug=${{ matrix.debug }}-failedbuild
@@ -133,9 +128,9 @@ jobs:
133128
if: ${{ matrix.arch != 'msvc' }}
134129
- name: Upload artifact
135130
if: ${{ github.event_name == 'pull_request'}}
136-
uses: actions/upload-artifact@v3
131+
uses: actions/upload-artifact@v4
137132
with:
138-
name: ${{ github.event.repository.name }}-${{ github.head_ref }}-${{ env.package_suffix }}
133+
name: ${{ github.event.repository.name }}-${{ env.package_suffix }}
139134
path: dist
140135
if-no-files-found: error
141136
- name: Zip up dist contents for release

.gitignore

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
# Ignore VS files
2+
*.suo
3+
*.db
4+
*.bak
5+
*.user
6+
**/.vs/
7+
**/MSVisualStudio/**/Release/
8+
**/MSVisualStudio/**/ReleaseParallel/
9+
**/MSVisualStudio/**/Debug/
10+
11+
# Ignore files created during unit tests
12+
**/MSVisualStudio/**/*.mps
13+
**/MSVisualStudio/**/*.lp
14+
**/MSVisualStudio/**/*.out

0 commit comments

Comments
 (0)