Skip to content

Commit 13c64b6

Browse files
authored
Merge pull request #56 from rmartin16/ci
Upgrade `upload-artifact` action to v4
2 parents db835ba + 65da1f3 commit 13c64b6

1 file changed

Lines changed: 17 additions & 12 deletions

File tree

.github/workflows/ci.yml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,17 @@ on:
66
- main
77
workflow_call:
88

9+
# Cancel active CI runs for a PR before starting another run
10+
concurrency:
11+
group: ${{ github.ref }}
12+
cancel-in-progress: true
13+
914
defaults:
1015
run:
11-
shell: bash # https://github.com/beeware/briefcase/pull/912
16+
shell: bash
17+
18+
env:
19+
FORCE_COLOR: "1"
1220

1321
jobs:
1422
pre-commit:
@@ -55,17 +63,17 @@ jobs:
5563
- backend: linux-system
5664
runs-on: ubuntu-latest
5765
python-version: "system"
58-
pre-command: "sudo apt-get update -y && sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config"
66+
pre-command: "sudo apt update -y && sudo apt install -y --no-install-recommends python3-dev python3-pip libcairo2-dev libgirepository1.0-dev gir1.2-gtk-3.0"
5967
briefcase-target: "linux system"
6068

6169
# - backend: linux-appimage
6270
# runs-on: ubuntu-latest
63-
# pre-command: "sudo apt-get update -y && sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config libfuse2"
71+
# pre-command: "sudo apt update -y && sudo apt install -y --no-install-recommends libfuse2 libthai-dev libegl1"
6472
# briefcase-target: "linux appimage"
6573

6674
- backend: linux-flatpak
6775
runs-on: ubuntu-latest
68-
pre-command: "sudo apt-get update -y && sudo apt-get install -y python3-gi python3-gi-cairo gir1.2-gtk-3.0 python3-dev libgirepository1.0-dev libcairo2-dev pkg-config flatpak flatpak-builder"
76+
pre-command: "sudo apt update -y && sudo apt install -y --no-install-recommends flatpak flatpak-builder elfutils"
6977
briefcase-target: "linux flatpak"
7078

7179
- backend: windows-VisualStudio
@@ -94,12 +102,9 @@ jobs:
94102
- backend: "android"
95103
python-version: "3.12"
96104

97-
# Support packages for Flatpak aren't available for 3.12+ on Linux yet
98-
- backend: "linux-flatpak"
99-
python-version: "3.12"
100-
101105
steps:
102-
- uses: actions/checkout@v4.1.1
106+
- name: Checkout
107+
uses: actions/checkout@v4.1.1
103108
with:
104109
fetch-depth: 0
105110

@@ -109,7 +114,7 @@ jobs:
109114
with:
110115
python-version: ${{ matrix.python-version }}
111116

112-
- name: Install dependencies
117+
- name: Install Dependencies
113118
run: ${{ matrix.pre-command }}
114119

115120
- name: Install Briefcase
@@ -121,8 +126,8 @@ jobs:
121126
- name: Package
122127
run: briefcase package ${{ matrix.briefcase-target }} --update --adhoc-sign
123128

124-
- name: Upload logs
125-
uses: actions/upload-artifact@v3.1.3
129+
- name: Upload Logs
130+
uses: actions/upload-artifact@v4.0.0
126131
if: failure()
127132
with:
128133
name: build-failure-logs-${{ matrix.backend }}-${{ matrix.python-version }}

0 commit comments

Comments
 (0)