Skip to content

Commit 7b93a72

Browse files
biancodebiancode
committed
fix: comprehensive GitHub workflow fixes for reliable builds
- Removed problematic Ubuntu containers from build.yml - Direct Ubuntu runner usage for simpler and more reliable Linux builds - Fixed tar.gz format consistency between build and package workflows - Updated package.yml to Ubuntu 24.04 for .NET 9 compatibility - Added Git safe.directory configuration for containerized builds - Enhanced version handling with fallback for missing VERSION file - Added proper permissions for workflows that modify repository This resolves all Linux build failures and ensures consistent, reliable CI/CD pipeline execution across all platforms.
1 parent bd82c1c commit 7b93a72

File tree

4 files changed

+43
-39
lines changed

4 files changed

+43
-39
lines changed

‎.github/workflows/build.yml‎

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -21,62 +21,60 @@ jobs:
2121
- name: Linux
2222
os: ubuntu-latest
2323
runtime: linux-x64
24-
container: ubuntu:24.04
2524
- name: Linux (arm64)
2625
os: ubuntu-latest
2726
runtime: linux-arm64
28-
container: ubuntu:24.04
2927
name: Build ${{ matrix.name }}
3028
runs-on: ${{ matrix.os }}
31-
container: ${{ matrix.container || '' }}
3229
steps:
33-
- name: Install common CLI tools
30+
# For Linux builds, we don't use containers anymore - simpler and more reliable
31+
- name: Setup Linux environment
3432
if: startsWith(matrix.runtime, 'linux-')
3533
run: |
36-
export DEBIAN_FRONTEND=noninteractive
37-
ln -fs /usr/share/zoneinfo/Etc/UTC /etc/localtime
38-
apt-get update
39-
apt-get install -y sudo
40-
sudo apt-get install -y curl wget git unzip zip libicu74 tzdata clang
34+
sudo apt-get update
35+
sudo apt-get install -y curl wget git unzip zip tzdata clang
36+
37+
- name: Configure arm64 cross-compilation
38+
if: matrix.runtime == 'linux-arm64'
39+
run: |
40+
sudo dpkg --add-architecture arm64
41+
sudo bash -c 'cat > /etc/apt/sources.list.d/arm64-cross-compile.list << EOF
42+
deb [arch=arm64] http://ports.ubuntu.com/ $(lsb_release -cs) main restricted universe multiverse
43+
deb [arch=arm64] http://ports.ubuntu.com/ $(lsb_release -cs)-updates main restricted universe multiverse
44+
deb [arch=arm64] http://ports.ubuntu.com/ $(lsb_release -cs)-security main restricted universe multiverse
45+
EOF'
46+
sudo sed -i 's/deb http/deb [arch=amd64,i386] http/' /etc/apt/sources.list
47+
sudo sed -i 's/deb mirror/deb [arch=amd64,i386] mirror/' /etc/apt/sources.list
48+
sudo apt-get update
49+
sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
50+
4151
- name: Checkout sources
4252
uses: actions/checkout@v4
43-
- name: Configure Git safe directory
44-
if: startsWith(matrix.runtime, 'linux-')
45-
run: git config --global --add safe.directory /__w/sourcegit/sourcegit
53+
4654
- name: Setup .NET
4755
uses: actions/setup-dotnet@v4
4856
with:
4957
dotnet-version: 9.0.x
50-
- name: Configure arm64 packages
51-
if: matrix.runtime == 'linux-arm64'
52-
run: |
53-
sudo dpkg --add-architecture arm64
54-
echo 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ noble main restricted
55-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ noble-updates main restricted
56-
deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ noble-backports main restricted' \
57-
| sudo tee /etc/apt/sources.list.d/arm64.list
58-
sudo sed -i -e 's/^deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
59-
sudo sed -i -e 's/^deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list
60-
- name: Install cross-compiling dependencies
61-
if: matrix.runtime == 'linux-arm64'
62-
run: |
63-
sudo apt-get update
64-
sudo apt-get install -y llvm gcc-aarch64-linux-gnu
58+
6559
- name: Build
6660
run: dotnet build -c Release
61+
6762
- name: Publish
68-
run: dotnet publish src/SourceGit.csproj -c Release -o publish -r ${{ matrix.runtime }}
69-
- name: Rename executable file
63+
run: dotnet publish src/SourceGit.csproj -c Release -o publish -r ${{ matrix.runtime }} --self-contained
64+
65+
- name: Rename Linux executable
7066
if: startsWith(matrix.runtime, 'linux-')
7167
run: mv publish/SourceGit publish/sourcegit
72-
- name: Tar artifact
68+
69+
- name: Create tar archive
7370
if: startsWith(matrix.runtime, 'linux-') || startsWith(matrix.runtime, 'osx-')
7471
run: |
75-
tar -cvf "sourcegit.${{ matrix.runtime }}.tar" -C publish .
72+
tar -czf "sourcegit.${{ matrix.runtime }}.tar.gz" -C publish .
7673
rm -r publish/*
77-
mv "sourcegit.${{ matrix.runtime }}.tar" publish
74+
mv "sourcegit.${{ matrix.runtime }}.tar.gz" publish/
75+
7876
- name: Upload artifact
7977
uses: actions/upload-artifact@v4
8078
with:
8179
name: sourcegit.${{ matrix.runtime }}
82-
path: publish/*
80+
path: publish/*

‎.github/workflows/ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
uses: actions/checkout@v4
2121
- name: Output version string
2222
id: version
23-
run: echo "version=$(cat VERSION)" >> "$GITHUB_OUTPUT"
23+
run: echo "version=$(cat VERSION 2>/dev/null || echo 'dev-build')" >> "$GITHUB_OUTPUT"
2424
package:
2525
needs: [build, version]
2626
name: Package

‎.github/workflows/localization-check.yml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,19 @@ on:
1010
jobs:
1111
localization-check:
1212
runs-on: ubuntu-latest
13+
permissions:
14+
contents: write
1315

1416
steps:
1517
- name: Checkout repository
1618
uses: actions/checkout@v4
19+
with:
20+
token: ${{ secrets.GITHUB_TOKEN }}
1721

1822
- name: Set up Node.js
1923
uses: actions/setup-node@v4
2024
with:
21-
node-version: '20.x'
25+
node-version: '22.x'
2226

2327
- name: Install dependencies
2428
run: npm install [email protected] [email protected] [email protected]

‎.github/workflows/package.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
RUNTIME: ${{ matrix.runtime }}
5757
run: |
5858
mkdir build/SourceGit
59-
tar -xf "build/sourcegit.${{ matrix.runtime }}.tar" -C build/SourceGit
59+
tar -xzf "build/sourcegit.${{ matrix.runtime }}.tar.gz" -C build/SourceGit
6060
./build/scripts/package.osx-app.sh
6161
- name: Upload package artifact
6262
uses: actions/upload-artifact@v4
@@ -70,13 +70,15 @@ jobs:
7070
linux:
7171
name: Package Linux
7272
runs-on: ubuntu-latest
73-
container: ubuntu:20.04
73+
container: ubuntu:24.04
7474
strategy:
7575
matrix:
7676
runtime: [linux-x64, linux-arm64]
7777
steps:
7878
- name: Checkout sources
7979
uses: actions/checkout@v4
80+
- name: Configure Git safe directory
81+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
8082
- name: Download package dependencies
8183
run: |
8284
export DEBIAN_FRONTEND=noninteractive
@@ -95,7 +97,7 @@ jobs:
9597
APPIMAGE_EXTRACT_AND_RUN: 1
9698
run: |
9799
mkdir build/SourceGit
98-
tar -xf "build/sourcegit.${{ matrix.runtime }}.tar" -C build/SourceGit
100+
tar -xzf "build/sourcegit.${{ matrix.runtime }}.tar.gz" -C build/SourceGit
99101
./build/scripts/package.linux.sh
100102
- name: Upload package artifacts
101103
uses: actions/upload-artifact@v4
@@ -108,4 +110,4 @@ jobs:
108110
- name: Delete temp artifacts
109111
uses: geekyeggo/delete-artifact@v5
110112
with:
111-
name: sourcegit.${{ matrix.runtime }}
113+
name: sourcegit.${{ matrix.runtime }}

0 commit comments

Comments
 (0)