119 lines
3.4 KiB
Diff
119 lines
3.4 KiB
Diff
From ae0bf9c4b7ec3088fa4eccc9750bead6757735e2 Mon Sep 17 00:00:00 2001
|
|
From: Christoph Reiter <reiter.christoph@gmail.com>
|
|
Date: Fri, 7 Apr 2023 10:56:47 +0200
|
|
Subject: [PATCH 139/N] CI: update actions and images
|
|
|
|
ubuntu-18.04 is gone now
|
|
---
|
|
.github/workflows/mingw.yml | 34 ++++++++++++++--------------------
|
|
1 file changed, 14 insertions(+), 20 deletions(-)
|
|
|
|
diff --git a/.github/workflows/mingw.yml b/.github/workflows/mingw.yml
|
|
index 6f88865..d32b528 100644
|
|
--- a/.github/workflows/mingw.yml
|
|
+++ b/.github/workflows/mingw.yml
|
|
@@ -24,7 +24,7 @@ jobs:
|
|
run: |
|
|
git config --global core.autocrlf false
|
|
git config --global core.eol lf
|
|
- - uses: actions/checkout@v2
|
|
+ - uses: actions/checkout@v3
|
|
- uses: msys2/setup-msys2@v2
|
|
with:
|
|
msystem: ${{ matrix.msystem }}
|
|
@@ -150,7 +150,7 @@ jobs:
|
|
tar -zcf python.tar.gz python_pkgdir/
|
|
|
|
- name: Upload
|
|
- uses: actions/upload-artifact@v2
|
|
+ uses: actions/upload-artifact@v3
|
|
if: always()
|
|
with:
|
|
name: build-${{ matrix.msystem }}
|
|
@@ -161,13 +161,13 @@ jobs:
|
|
container:
|
|
image: archlinux:base-devel
|
|
steps:
|
|
- - uses: actions/checkout@v2
|
|
+ - uses: actions/checkout@v3
|
|
- name: Install deps
|
|
run: |
|
|
pacman --noconfirm -Suuy
|
|
pacman --needed --noconfirm -S mingw-w64-gcc autoconf-archive autoconf automake zip
|
|
|
|
- - uses: actions/setup-python@v2
|
|
+ - uses: actions/setup-python@v4
|
|
with:
|
|
python-version: '3.10'
|
|
|
|
@@ -201,7 +201,7 @@ jobs:
|
|
zip -r install.zip _build/install
|
|
|
|
- name: Upload
|
|
- uses: actions/upload-artifact@v2
|
|
+ uses: actions/upload-artifact@v3
|
|
with:
|
|
name: build-cross-gcc-x86_64
|
|
path: install.zip
|
|
@@ -210,7 +210,7 @@ jobs:
|
|
needs: [cross-gcc-x86_64]
|
|
runs-on: windows-latest
|
|
steps:
|
|
- - uses: actions/download-artifact@v2
|
|
+ - uses: actions/download-artifact@v3
|
|
with:
|
|
name: build-cross-gcc-x86_64
|
|
|
|
@@ -221,27 +221,21 @@ jobs:
|
|
|
|
|
|
cross-llvm-mingw:
|
|
- runs-on: ubuntu-18.04
|
|
+ runs-on: ubuntu-latest
|
|
container:
|
|
image: mstorsjo/llvm-mingw:latest
|
|
strategy:
|
|
matrix:
|
|
arch: ['x86_64', 'i686', 'aarch64', 'armv7']
|
|
steps:
|
|
- - uses: actions/checkout@v2
|
|
+ - uses: actions/checkout@v3
|
|
+
|
|
- name: Install deps
|
|
run: |
|
|
+ export DEBIAN_FRONTEND=noninteractive
|
|
+ add-apt-repository --yes ppa:deadsnakes/ppa
|
|
apt-get update -qq
|
|
- apt-get install -qqy autoconf-archive
|
|
-
|
|
- - uses: actions/setup-python@v2
|
|
- with:
|
|
- python-version: '3.10'
|
|
-
|
|
- - name: Check Python Version
|
|
- run: |
|
|
- which python
|
|
- python --version
|
|
+ apt-get install -qqy autoconf-archive python3.10-dev python3.10
|
|
|
|
- name: Build
|
|
run: |
|
|
@@ -271,7 +265,7 @@ jobs:
|
|
zip -r install.zip _build/install
|
|
|
|
- name: Upload
|
|
- uses: actions/upload-artifact@v2
|
|
+ uses: actions/upload-artifact@v3
|
|
with:
|
|
name: build-cross-llvm-mingw-${{ matrix.arch }}
|
|
path: install.zip
|
|
@@ -283,7 +277,7 @@ jobs:
|
|
matrix:
|
|
arch: ['x86_64', 'i686']
|
|
steps:
|
|
- - uses: actions/download-artifact@v2
|
|
+ - uses: actions/download-artifact@v3
|
|
with:
|
|
name: build-cross-llvm-mingw-${{ matrix.arch }}
|
|
|