Skip to content

Commit aefcecd

Browse files
committed
💚 fix: build and release
1 parent 18756cd commit aefcecd

File tree

1 file changed

+10
-19
lines changed

1 file changed

+10
-19
lines changed

.github/workflows/build-and-release.yml

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,19 @@ jobs:
1111
strategy:
1212
matrix:
1313
os: [ubuntu-latest, ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-latest, windows-2022, windows-2019]
14-
arch: [x64, x86]
1514
include:
1615
- os: ubuntu-latest
1716
ostype: linux
18-
install: sudo apt-get update && sudo apt-get install -y libboost-all-dev:i386 clang g++-multilib
17+
install: sudo apt-get update && sudo apt-get install -y libboost-all-dev clang g++-multilib
1918
- os: ubuntu-24.04
2019
ostype: linux
21-
install: sudo apt-get update && sudo apt-get install -y libboost-all-dev:i386 clang g++-multilib
20+
install: sudo apt-get update && sudo apt-get install -y libboost-all-dev clang g++-multilib
2221
- os: ubuntu-22.04
2322
ostype: linux
24-
install: sudo apt-get update && sudo apt-get install -y libboost-all-dev:i386 clang g++-multilib
23+
install: sudo apt-get update && sudo apt-get install -y libboost-all-dev clang g++-multilib
2524
- os: ubuntu-20.04
2625
ostype: linux
27-
install: sudo apt-get update && sudo apt-get install -y libboost-all-dev:i386 clang g++-multilib
26+
install: sudo apt-get update && sudo apt-get install -y libboost-all-dev clang g++-multilib
2827
- os: windows-latest
2928
ostype: windows
3029
install: |
@@ -56,21 +55,13 @@ jobs:
5655
run: ${{ matrix.install }}
5756

5857
- name: Build - Windows (x64)
59-
if: matrix.ostype == 'windows' && matrix.arch == 'x64'
58+
if: matrix.ostype == 'windows'
6059
run: clang++ -o cmr_cache.exe main.cpp -I./vendor/ -I./boost/ -L./boost/lib -llibboost_system-vc143-mt-x64-1_85 -std=c++17
6160

62-
- name: Build - Windows (x86)
63-
if: matrix.ostype == 'windows' && matrix.arch == 'x86'
64-
run: clang++ -o cmr_cache.exe main.cpp -I./vendor/ -I./boost/ -L./boost/lib -llibboost_system-vc143-mt-x32-1_85 -std=c++17 -m32
65-
6661
- name: Build - Linux (x64)
67-
if: matrix.ostype != 'windows' && matrix.arch == 'x64'
62+
if: matrix.ostype != 'windows'
6863
run: clang++ -o cmr_cache main.cpp -I./vendor/ -I/usr/include/boost -L/usr/lib/x86_64-linux-gnu -lboost_system -lpthread -std=c++17
6964

70-
- name: Build - Linux (x86)
71-
if: matrix.ostype != 'windows' && matrix.arch == 'x86'
72-
run: clang++ -o cmr_cache main.cpp -I./vendor/ -I/usr/include/boost -L/usr/lib/i386-linux-gnu -lboost_system -lpthread -std=c++17 -m32
73-
7465
- name: Get the tag
7566
run: echo "GITHUB_REF=${{ github.ref }}"
7667

@@ -93,7 +84,7 @@ jobs:
9384
cp cmr_cache.exe release/
9485
cp -r config/ release/
9586
cp -r data/ release/
96-
tar -czf cmr_cache_${{ matrix.os }}_${{ matrix.arch }}.tar.gz release
87+
tar -czf cmr_cache_${{ matrix.os }}_x64.tar.gz release
9788
9889
- name: Create Release Archive - Others OS
9990
if: matrix.ostype != 'windows'
@@ -102,14 +93,14 @@ jobs:
10293
cp cmr_cache release/
10394
cp -r config/ release/
10495
cp -r data/ release/
105-
tar -czf cmr_cache_${{ matrix.os }}_${{ matrix.arch }}.tar.gz release
96+
tar -czf cmr_cache_${{ matrix.os }}_x64.tar.gz release
10697
10798
- name: Upload Release Asset
10899
uses: actions/upload-release-asset@v1
109100
with:
110101
upload_url: ${{ steps.create_release.outputs.upload_url }}
111-
asset_path: cmr_cache_${{ matrix.os }}_${{ matrix.arch }}.tar.gz
112-
asset_name: cmr_cache_${{ matrix.os }}_${{ matrix.arch }}.tar.gz
102+
asset_path: cmr_cache_${{ matrix.os }}_x64.tar.gz
103+
asset_name: cmr_cache_${{ matrix.os }}_x64.tar.gz
113104
asset_content_type: application/gzip
114105
env:
115106
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)