Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a Windows 7 build #3530

Merged
merged 12 commits into from
Jul 15, 2024
Merged

Add a Windows 7 build #3530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2c516e1
windows 7 build
mmmray Jul 12, 2024
546dded
use go mod edit
mmmray Jul 12, 2024
e95a3d1
Update go.mod
RPRX Jul 14, 2024
a6b49a7
do not read gotoolchain from file anymore
mmmray Jul 14, 2024
0153801
fix tests
mmmray Jul 14, 2024
1448958
fix quoting again
mmmray Jul 14, 2024
f359829
debug ci
mmmray Jul 14, 2024
f1c9a11
set exact minimum version in go.mod
mmmray Jul 14, 2024
6f471a1
Revert "debug ci"
mmmray Jul 14, 2024
18cf659
Update go.mod
RPRX Jul 15, 2024
db05309
Update test.yml
RPRX Jul 15, 2024
692ea91
Update go.mod
RPRX Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ jobs:
# Include amd64 on all platforms.
goos: [windows, freebsd, openbsd, linux, darwin]
goarch: [amd64, 386]
gotoolchain: [""]
patch-assetname: [""]

exclude:
# Exclude i386 on darwin
- goarch: 386
Expand Down Expand Up @@ -152,6 +155,16 @@ jobs:
goarch: arm
goarm: 7
# END OPENBSD ARM
# BEGIN Windows 7
- goos: windows
goarch: amd64
gotoolchain: 1.21.4
patch-assetname: win7-64
- goos: windows
goarch: 386
gotoolchain: 1.21.4
patch-assetname: win7-32
# END Windows 7
fail-fast: false

runs-on: ubuntu-latest
Expand All @@ -164,16 +177,17 @@ jobs:
- name: Checkout codebase
uses: actions/checkout@v4

- name: Show workflow information
- name: Show workflow information
run: |
export _NAME=$(jq ".[\"$GOOS-$GOARCH$GOARM$GOMIPS\"].friendlyName" -r < .github/build/friendly-filenames.json)
_NAME=${{ matrix.patch-assetname }}
[ -n "$_NAME" ] || _NAME=$(jq ".[\"$GOOS-$GOARCH$GOARM$GOMIPS\"].friendlyName" -r < .github/build/friendly-filenames.json)
echo "GOOS: $GOOS, GOARCH: $GOARCH, GOARM: $GOARM, GOMIPS: $GOMIPS, RELEASE_NAME: $_NAME"
echo "ASSET_NAME=$_NAME" >> $GITHUB_ENV

- name: Set up Go
uses: actions/setup-go@v5
with:
go-version-file: go.mod
go-version: ${{ matrix.gotoolchain || '1.22' }}
check-latest: true

- name: Get project dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Set up Go
uses: actions/setup-go@v5
with:
go-version-file: go.mod
go-version: '1.22'
check-latest: true
- name: Restore Cache
uses: actions/cache/restore@v4
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/xtls/xray-core

go 1.22
go 1.21.4

require (
github.com/OmarTariq612/goech v0.0.0-20240405204721-8e2e1dafd3a0
Expand Down