Skip to content

Commit 319614d

Browse files
committed
ubuntu 18.04 -> 20.04
- ubuntu 18.04 runners are being removed from GHA - also remove unused msvc and mingw 32-bit builds
1 parent 3df11a1 commit 319614d

File tree

3 files changed

+4
-124
lines changed

3 files changed

+4
-124
lines changed

.github/workflows/release.yml

Lines changed: 3 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ env:
88
jobs:
99
linux:
1010
name: Linux
11-
runs-on: ubuntu-18.04
11+
runs-on: ubuntu-20.04
1212
env:
1313
INSTALL_PREFIX: "/opt/smelibs"
1414
SUDO_CMD: "sudo"
@@ -24,7 +24,7 @@ jobs:
2424
- name: Add llvm repo for clang 14 & install
2525
run: |
2626
sudo wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
27-
sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-14 main"
27+
sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-14 main"
2828
sudo apt update -yy
2929
sudo apt install -yy clang-14
3030
- name: Set clang version
@@ -86,72 +86,9 @@ jobs:
8686
with:
8787
path: ./artefacts/*
8888

89-
win32-mingw:
90-
name: Windows 32-bit Mingw
91-
runs-on: windows-2022
92-
env:
93-
INSTALL_PREFIX: "/c/smelibs"
94-
SUDO_CMD: ""
95-
TARGET_TRIPLE: "x86_64-w32-windows-gnu"
96-
PYTHON_EXE: "/mingw32/bin/python"
97-
OS: "win32-mingw"
98-
defaults:
99-
run:
100-
shell: msys2 {0}
101-
steps:
102-
- uses: actions/checkout@v3
103-
- uses: msys2/setup-msys2@v2
104-
with:
105-
msystem: MINGW32
106-
update: true
107-
install: mingw-w64-i686-gcc mingw-w64-i686-cmake mingw-w64-i686-python make
108-
- name: Build script
109-
run: ./build.sh
110-
- uses: actions/upload-artifact@v3
111-
with:
112-
path: ./artefacts/*
113-
114-
win64-msvc:
115-
name: Windows 64-bit MSVC
116-
runs-on: windows-2022
117-
env:
118-
INSTALL_PREFIX: 'C:\smelibs'
119-
TARGET_TRIPLE: "x86_64-pc-windows-gnu"
120-
OS: "win64-msvc"
121-
steps:
122-
- uses: actions/checkout@v3
123-
- uses: ilammy/msvc-dev-cmd@v1
124-
with:
125-
arch: amd64
126-
toolset: 14.0
127-
- name: Build script
128-
run: ./build.ps1
129-
- uses: actions/upload-artifact@v3
130-
with:
131-
path: ./artefacts/*
132-
133-
win32-msvc:
134-
name: Windows 32-bit MSVC
135-
runs-on: windows-2022
136-
env:
137-
INSTALL_PREFIX: 'C:\smelibs'
138-
TARGET_TRIPLE: "i686-pc-windows-gnu"
139-
OS: "win32-msvc"
140-
steps:
141-
- uses: actions/checkout@v3
142-
- uses: ilammy/msvc-dev-cmd@v1
143-
with:
144-
arch: amd64_x86
145-
toolset: 14.0
146-
- name: Build script
147-
run: ./build.ps1
148-
- uses: actions/upload-artifact@v3
149-
with:
150-
path: ./artefacts/*
151-
15289
release:
15390
name: Upload Binaries to GitHub Release
154-
needs: [linux, macos, win64-mingw, win32-mingw, win64-msvc, win32-msvc]
91+
needs: [linux, macos, win64-mingw]
15592
runs-on: ubuntu-latest
15693
# upload binaries to github release if commit is tagged
15794
if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44

55
Get the latest versions here:
66

7-
- linux (clang 14 / Ubuntu 18.04): [sme_deps_llvm_linux.tgz](https://github.com/spatial-model-editor/sme_deps_llvm/releases/latest/download/sme_deps_llvm_linux.tgz)
7+
- linux (clang 14 / Ubuntu 20.04): [sme_deps_llvm_linux.tgz](https://github.com/spatial-model-editor/sme_deps_llvm/releases/latest/download/sme_deps_llvm_linux.tgz)
88
- osx (Apple clang 13 / macOS 11): [sme_deps_llvm_osx.tgz](https://github.com/spatial-model-editor/sme_deps_llvm/releases/latest/download/sme_deps_llvm_osx.tgz)
9-
- win32-mingw (mingw-w64-i686-gcc 12): [sme_deps_llvm_win32-mingw.tgz](https://github.com/spatial-model-editor/sme_deps_llvm/releases/latest/download/sme_deps_llvm_win32-mingw.tgz)
109
- win64-mingw (mingw-w64-x86_64-gcc 12): [sme_deps_llvm_win64-mingw.tgz](https://github.com/spatial-model-editor/sme_deps_llvm/releases/latest/download/sme_deps_llvm_win64-mingw.tgz)
11-
- win32-msvc (VC++ 2015 Toolset): [sme_deps_llvm_win32-msvc.tgz](https://github.com/spatial-model-editor/sme_deps_llvm/releases/latest/download/sme_deps_llvm_win32-msvc.tgz)
12-
- win64-msvc (VC++ 2015 Toolset): [sme_deps_llvm_win64-msvc.tgz](https://github.com/spatial-model-editor/sme_deps_llvm/releases/latest/download/sme_deps_llvm_win64-msvc.tgz)

build.ps1

Lines changed: 0 additions & 54 deletions
This file was deleted.

0 commit comments

Comments
 (0)