Skip to content

Commit dc5d578

Browse files
committed
Enable master branch builds and cleanup Linux workflow
1 parent 289d7d4 commit dc5d578

1 file changed

Lines changed: 5 additions & 36 deletions

File tree

.github/workflows/release.yml

Lines changed: 5 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@ name: Release Build
22

33
on:
44
push:
5+
branches: [ "master" ]
56
tags: [ "v*" ]
67
workflow_dispatch:
78

89
env:
910
CARGO_TERM_COLOR: always
10-
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
1111

1212
jobs:
1313
build-windows:
1414
name: Build Windows
1515
runs-on: windows-latest
16+
env:
17+
VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
1618
steps:
1719
- uses: actions/checkout@v6
1820

@@ -117,7 +119,7 @@ jobs:
117119
118120
build-linux:
119121
name: Build Linux
120-
runs-on: ubuntu-latest
122+
runs-on: ubuntu-24.04
121123
steps:
122124
- uses: actions/checkout@v6
123125

@@ -132,27 +134,7 @@ jobs:
132134
- name: Install System Dependencies
133135
run: |
134136
sudo apt-get update
135-
sudo apt-get install -y build-essential pkg-config libssl-dev libfuse2
136-
137-
- name: Cache vcpkg installed packages
138-
uses: actions/cache@v4
139-
with:
140-
path: vcpkg_installed
141-
key: ${{ runner.os }}-vcpkg-release-${{ hashFiles('vcpkg.json') }}
142-
restore-keys: |
143-
${{ runner.os }}-vcpkg-release-
144-
145-
- name: Setup vcpkg
146-
uses: lukka/run-vcpkg@v11
147-
with:
148-
vcpkgGitCommitId: '84bab45d415d22042bd0b9081aea57f362da3f35'
149-
vcpkgDirectory: '${{ github.workspace }}/vcpkg'
150-
vcpkgJsonGlob: 'vcpkg.json'
151-
runVcpkgInstall: true
152-
env:
153-
VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed
154-
VCPKG_DEFAULT_TRIPLET: x64-linux-release
155-
VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/triplets
137+
sudo apt-get install -y build-essential pkg-config libssl-dev libfuse2 libtorrent-rasterbar-dev libboost-dev
156138
157139
- name: Cargo Chef Prepare
158140
run: cargo chef prepare --recipe-path recipe.json
@@ -165,27 +147,16 @@ jobs:
165147

166148
- name: Cargo Chef Cook
167149
run: |
168-
export VCPKG_ROOT=${{ github.workspace }}/vcpkg
169150
cargo chef cook --release --recipe-path recipe.json --features libtorrent --no-default-features
170-
env:
171-
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
172-
VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed
173-
PKG_CONFIG_PATH: ${{ github.workspace }}/vcpkg_installed/x64-linux-release/lib/pkgconfig
174151
175152
- name: Restore Source Code
176153
run: git restore server enginefs libtorrent-sys
177154

178155
- name: Build Release
179156
run: cargo build --release --features libtorrent --no-default-features
180-
env:
181-
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
182-
VCPKG_INSTALLED_DIR: ${{ github.workspace }}/vcpkg_installed
183-
PKG_CONFIG_PATH: ${{ github.workspace }}/vcpkg_installed/x64-linux-release/lib/pkgconfig
184157

185158
- name: Build DEB Package
186159
run: cargo deb --package server --no-build
187-
env:
188-
VCPKG_ROOT: ${{ github.workspace }}/vcpkg
189160

190161
- name: Build AppImage
191162
run: |
@@ -259,8 +230,6 @@ jobs:
259230
260231
- name: Build binary
261232
run: cargo build --release --features libtorrent --no-default-features
262-
env:
263-
VCPKG_ROOT: ""
264233

265234
- name: Create PKGBUILD
266235
run: |

0 commit comments

Comments
 (0)