Skip to content
This repository was archived by the owner on Jun 4, 2023. It is now read-only.

Commit 8f2de3b

Browse files
committed
Tweak CI for github needed changes
Signed-off-by: falkTX <falktx@falktx.com>
1 parent 910bf07 commit 8f2de3b

2 files changed

Lines changed: 12 additions & 44 deletions

File tree

.github/workflows/release.yml

Lines changed: 11 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -2,45 +2,21 @@ name: release
22

33
on:
44
push:
5+
branches:
6+
- '*'
7+
pull_request:
8+
branches:
9+
- '*'
510

611
env:
7-
CACHE_VERSION: 10
12+
CACHE_VERSION: 11
813
DEBIAN_FRONTEND: noninteractive
914
HOMEBREW_NO_AUTO_UPDATE: 1
1015

1116
jobs:
12-
# macOS native intel build
13-
#macos:
14-
#runs-on: macos-10.15
15-
#steps:
16-
#- uses: actions/checkout@v3
17-
#with:
18-
#submodules: recursive
19-
#- name: Set up cache
20-
#uses: actions/cache@v3
21-
#with:
22-
#path: |
23-
#~/PawPawBuilds
24-
#key: macos-v${{ env.CACHE_VERSION }}
25-
#- name: Set up dependencies
26-
#run: |
27-
#brew install cmake jq meson
28-
#- name: Bootstrap macOS intel
29-
#shell: bash
30-
#run: |
31-
#./PawPaw/bootstrap-carla.sh macos && ./PawPaw/.cleanup.sh macos
32-
#- name: Build macOS intel
33-
#shell: bash
34-
#run: |
35-
#./build.sh macos
36-
#- uses: actions/upload-artifact@v3
37-
#with:
38-
#name: macOS intel package
39-
#path: Carla/*.dmg
40-
4117
# macOS native universal build
4218
macos_universal:
43-
runs-on: macos-10.15
19+
runs-on: macos-11
4420
steps:
4521
- uses: actions/checkout@v3
4622
with:
@@ -54,10 +30,6 @@ jobs:
5430
- name: Set up dependencies
5531
run: |
5632
brew install cmake jq meson
57-
- name: Fix up Xcode
58-
run: |
59-
sudo rm -Rf /Library/Developer/CommandLineTools/SDKs/*
60-
sudo xcode-select -s "/Applications/Xcode_12.3.app"
6133
- name: Bootstrap macOS universal
6234
shell: bash
6335
run: |
@@ -101,13 +73,11 @@ jobs:
10173
- name: Fix GitHub's mess
10274
run: |
10375
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
76+
sudo dpkg --add-architecture i386
10477
sudo apt-get update -qq
105-
sudo apt-get install -yqq --allow-downgrades libgd3/jammy
106-
sudo apt-get purge -yqq libmono* moby* mono* msbuild* php* libgdiplus libpcre2-posix3 nuget
78+
sudo apt-get install -yqq --allow-downgrades libc6:i386 libgcc-s1:i386 libstdc++6:i386
10779
- name: Set up dependencies
10880
run: |
109-
sudo dpkg --add-architecture i386
110-
sudo apt-get update -qq
11181
sudo apt-get install -y build-essential curl cmake jq meson mingw-w64 gperf qttools5-dev qttools5-dev-tools xvfb \
11282
binutils-mingw-w64-i686 g++-mingw-w64-i686 mingw-w64 wine-stable
11383
- name: Cache debian packages
@@ -157,13 +127,11 @@ jobs:
157127
- name: Fix GitHub's mess
158128
run: |
159129
sudo rm -f /etc/apt/sources.list.d/microsoft-prod.list
130+
sudo dpkg --add-architecture i386
160131
sudo apt-get update -qq
161-
sudo apt-get install -yqq --allow-downgrades libgd3/jammy
162-
sudo apt-get purge -yqq libmono* moby* mono* msbuild* php* libgdiplus libpcre2-posix3 nuget
132+
sudo apt-get install -yqq --allow-downgrades libc6:i386 libgcc-s1:i386 libstdc++6:i386
163133
- name: Set up dependencies
164134
run: |
165-
sudo dpkg --add-architecture i386
166-
sudo apt-get update -qq
167135
sudo apt-get install -y build-essential curl cmake jq meson mingw-w64 gperf qttools5-dev qttools5-dev-tools xvfb \
168136
binutils-mingw-w64-x86-64 g++-mingw-w64-x86-64 mingw-w64 wine-stable
169137
- name: Cache debian packages

Carla

0 commit comments

Comments
 (0)