Skip to content

Commit cc6138c

Browse files
authored
Merge pull request #267 from achilleas-k/dist/win64
LGTM
2 parents 61471ef + 64df72c commit cc6138c

File tree

7 files changed

+408
-337
lines changed

7 files changed

+408
-337
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ $(BUILDLOC)/linux/$(GIN): $(SOURCES)
5454
GOOS=linux GOARCH=amd64 go build -o $(BUILDLOC)/linux/$(GIN) $(LDFLAGS)
5555

5656
$(BUILDLOC)/windows/$(GIN).exe: $(SOURCES)
57-
GOOS=windows GOARCH=386 go build -o $(BUILDLOC)/windows/$(GIN).exe $(LDFLAGS)
57+
GOOS=windows GOARCH=386 go build -o $(BUILDLOC)/windows32/$(GIN).exe $(LDFLAGS)
58+
GOOS=windows GOARCH=amd64 go build -o $(BUILDLOC)/windows64/$(GIN).exe $(LDFLAGS)
5859

5960
$(BUILDLOC)/darwin/$(GIN): $(SOURCES)
6061
GOOS=darwin GOARCH=amd64 go build -o $(BUILDLOC)/darwin/$(GIN) $(LDFLAGS)

appveyor.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,24 @@ environment:
1010
GOPATH: C:\gopath
1111
BINDIR: bin
1212
# download dev build
13-
BUNDLEURL: https://gin.g-node.org/achilleas/gin-cli-builds/raw/master/gin-cli-latest-windows-386.zip
13+
BUNDLEREPO: https://gin.g-node.org/achilleas/gin-cli-builds/raw/master
1414
GIN_LOG_DIR: C:\gin-log
1515

16+
matrix:
17+
# 32-bit
18+
- arch: "386"
19+
20+
# 64-bit
21+
- arch: "amd64"
22+
23+
1624

1725
install:
1826
- set PATH=C:\Python37-x64\;%PATH%;%GOPATH%\bin;c:\gin-bundle\git\usr\bin
1927
# download latest stable gin-cli-windows-bundle
2028
- md c:\gin-bundle
2129
- cd c:\gin-bundle
22-
- ps: Invoke-WebRequest -URI $env:BUNDLEURL -OutFile "gin-cli-bundle.zip"
30+
- ps: Invoke-WebRequest -URI $env:BUNDLEREPO/gin-cli-latest-windows-$env:arch.zip -OutFile "gin-cli-bundle.zip"
2331
- 7z x gin-cli-bundle.zip
2432
- git-annex version
2533
# go stuff
@@ -44,6 +52,7 @@ build_script:
4452
- go get github.com/alecthomas/template
4553
- go get github.com/dustin/go-humanize
4654
- go vet ./...
55+
- set GOARCH=%arch%
4756
- go build -ldflags "-X main.gincliversion=APPVEYOR-%APPVEYOR_REPO_NAME%-%APPVEYOR_REPO_BRANCH% -X main.build=%APPVEYOR_BUILD_NUMBER% -X main.commit=%APPVEYOR_REPO_COMMIT%" -o %GOPATH%\bin\gin.exe .
4857

4958
before_test:

0 commit comments

Comments
 (0)