Skip to content

Commit 6b7a0ad

Browse files
authored
Merge pull request jamulussoftware#3797 from softins/build-updates
CI build Linux directly on Ubuntu 22
2 parents d3ac7e1 + 8535bb6 commit 6b7a0ad

1 file changed

Lines changed: 0 additions & 23 deletions

File tree

.github/workflows/autobuild.yml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -205,22 +205,19 @@ jobs:
205205
- config_name: Linux .deb amd64 (artifacts+codeQL)
206206
target_os: linux
207207
building_on_os: ubuntu-22.04
208-
building_container: ubuntu:20.04
209208
base_command: ./.github/autobuild/linux_deb.sh
210209
run_codeql: true
211210
is_main_build_target: true
212211

213212
- config_name: Linux .deb armhf (artifacts)
214213
target_os: linux
215214
building_on_os: ubuntu-22.04-arm
216-
building_container: ubuntu:20.04
217215
base_command: TARGET_ARCH=armhf ./.github/autobuild/linux_deb.sh
218216
run_codeql: false
219217

220218
- config_name: Linux .deb arm64 (artifacts)
221219
target_os: linux
222220
building_on_os: ubuntu-22.04-arm
223-
building_container: ubuntu:20.04
224221
base_command: TARGET_ARCH=arm64 ./.github/autobuild/linux_deb.sh
225222
run_codeql: false
226223

@@ -280,33 +277,13 @@ jobs:
280277
is_main_build_target: null
281278

282279
runs-on: ${{ matrix.config.building_on_os }}
283-
container: ${{ matrix.config.building_container }}
284280
steps:
285281
- name: Select Xcode version for Mac
286282
if: matrix.config.target_os == 'macos' || matrix.config.target_os == 'ios'
287283
uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90
288284
with:
289285
xcode-version: ${{ matrix.config.xcode_version }}
290286

291-
- name: Set up base dependencies in container environment
292-
if: matrix.config.building_container == 'ubuntu:20.04'
293-
run: |
294-
set -eu
295-
apt-get -qq update
296-
apt-get install -y software-properties-common sudo curl
297-
add-apt-repository ppa:git-core/ppa
298-
curl -fsSL https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo dd of=/usr/share/keyrings/githubcli-archive-keyring.gpg
299-
sudo chmod go+r /usr/share/keyrings/githubcli-archive-keyring.gpg
300-
echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null
301-
apt-get -qq update
302-
apt-get -qq -y install git-core gh
303-
# Github Runner environments usually whitelist the default checkout directory for git.
304-
# However, when using containers, we have to do that manually in order for git commands to work
305-
# (e.g. in Jamulus.pro's VERSION logic):
306-
# https://github.com/actions/runner/issues/2033
307-
# https://github.com/actions/checkout/issues/766
308-
git config --global --add safe.directory "${GITHUB_WORKSPACE}"
309-
310287
- name: Checkout code
311288
uses: actions/checkout@v7
312289
with:

0 commit comments

Comments
 (0)