Skip to content

Commit 7676cf2

Browse files
committed
fix: ci dep and go dep, site
1 parent 21dd83c commit 7676cf2

File tree

6 files changed

+25
-11
lines changed

6 files changed

+25
-11
lines changed

.github/workflows/release.yml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,16 @@ jobs:
4040
with:
4141
go-version: '^1.25.5'
4242

43+
- name: Install MinGW-w64 cross-compiler
44+
run: |
45+
sudo apt-get update
46+
sudo apt-get install -y \
47+
gcc-mingw-w64-x86-64 \
48+
g++-mingw-w64-x86-64 \
49+
binutils-mingw-w64-x86-64
50+
sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix || true
51+
sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix || true
52+
4353
- name: Grant execute permission for gradlew
4454
run: chmod +x gradlew
4555

@@ -61,4 +71,5 @@ jobs:
6171
run: ./gradlew buildConveyorSiteRelease
6272
env:
6373
CONVEYOR_SIGNING_KEY: ${{ secrets.CONVEYOR_SIGNING_KEY }}
64-
CONVEYOR_PAT: ${{ secrets.CONVEYOR_PAT }}
74+
CONVEYOR_PAT: ${{ secrets.CONVEYOR_PAT }}
75+
CONVEYOR_AGREE_TO_LICENSE: "1"

build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ registerConveyorTask("buildConveyorSite", "site", "site")
6767

6868
registerConveyorTask("buildLinuxDebRelease", "debian-package", "deb", "conveyor-release.conf")
6969
registerConveyorTask("buildWindowsMsixRelease", "windows-msix", "windows", "conveyor-release.conf")
70-
registerConveyorTask("buildConveyorSiteRelease", "site", "site", "conveyor-release.conf")
70+
registerConveyorTask("buildConveyorSiteRelease", "copied-site", "site", "conveyor-release.conf")
7171

7272

7373
tasks.register<Delete>("clean") {

buildSrc/src/main/kotlin/Tasks.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ fun Project.registerConveyorTask(
2525
packageType,
2626
)
2727

28-
// to prevent resources issues on runners
29-
if (configFile.contains("release")) {
30-
args.add("--parallelism=3")
31-
}
32-
3328
if (signingKeyEnv == null) {
3429
// dev builds use passphrase
3530
environment(

conveyor-release.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ app.signing-key = ${env.CONVEYOR_SIGNING_KEY}
55
conveyor.billing-email = "dev@zaneschepke.com"
66

77
app {
8+
9+
site {
10+
copy-to = "."
11+
}
812
// will overwrite base-url
913
github {
1014
oauth-token = ${env.CONVEYOR_PAT}

tunnel/tools/libwg-go/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ require (
5050
gvisor.dev/gvisor v0.0.0-20250205023644-9414b50a5633 // indirect; ind
5151
)
5252

53-
//replace github.com/amnezia-vpn/amneziawg-go => github.com/wgtunnel/amneziawg-go v0.0.0-20251225080458-6a08ea62878d
53+
replace github.com/amnezia-vpn/amneziawg-go => github.com/wgtunnel/amneziawg-go v0.0.0-20260131215402-c95dc674538f
5454

55-
//replace github.com/artem-russkikh/wireproxy-awg => github.com/wgtunnel/wireproxy-awg v0.0.0-20251215030122-ffaf05dda47f
55+
replace github.com/artem-russkikh/wireproxy-awg => github.com/wgtunnel/wireproxy-awg v0.0.0-20260202091409-bf26e89261db
5656

5757
// local dev
58-
replace github.com/amnezia-vpn/amneziawg-go => ../../../../amneziawg-go
58+
//replace github.com/amnezia-vpn/amneziawg-go => ../../../../amneziawg-go
5959

6060
//
61-
replace github.com/artem-russkikh/wireproxy-awg => ../../../../wireproxy-awg
61+
//replace github.com/artem-russkikh/wireproxy-awg => ../../../../wireproxy-awg

tunnel/tools/libwg-go/go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ github.com/vishvananda/netlink v1.3.1 h1:3AEMt62VKqz90r0tmNhog0r/PpWKmrEShJU0wJW
4444
github.com/vishvananda/netlink v1.3.1/go.mod h1:ARtKouGSTGchR8aMwmkzC0qiNPrrWO5JS/XMVl45+b4=
4545
github.com/vishvananda/netns v0.0.5 h1:DfiHV+j8bA32MFM7bfEunvT8IAqQ/NzSJHtcmW5zdEY=
4646
github.com/vishvananda/netns v0.0.5/go.mod h1:SpkAiCQRtJ6TvvxPnOSyH3BMl6unz3xZlaprSwhNNJM=
47+
github.com/wgtunnel/amneziawg-go v0.0.0-20260131215402-c95dc674538f h1:kSHf1VZqhR5C6EEMS16y1kB9PnsA81tKB3I1yzGsPpA=
48+
github.com/wgtunnel/amneziawg-go v0.0.0-20260131215402-c95dc674538f/go.mod h1:dXqnIemvu1lQHb9sp8i4452qL/2z2s0AuOibemqrsUc=
49+
github.com/wgtunnel/wireproxy-awg v0.0.0-20260202091409-bf26e89261db h1:3rnnvIqCZAeXHTSDkrtqMKKprcmVnpVYzIideyXEJAg=
50+
github.com/wgtunnel/wireproxy-awg v0.0.0-20260202091409-bf26e89261db/go.mod h1:YtnutLQwL21gDUMEa7e2Yp6sdK80aQukrG0ujhxH4QY=
4751
go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
4852
go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
4953
go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y=

0 commit comments

Comments
 (0)