From a0e731de6ab68edc9c63bd337e56cd74776c1799 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Tue, 31 Jan 2023 20:53:50 -0800 Subject: [PATCH 01/13] Check --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 8416bff..616d0e5 100644 --- a/.drone.yml +++ b/.drone.yml @@ -47,6 +47,8 @@ steps: - name: deps path: /go commands: + - uname -a + - ldd --version - go mod download - gomobile init - make android -- 2.25.1 From 2023069fbc0880eb39c7874226c50586cf09dba5 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Tue, 31 Jan 2023 21:11:10 -0800 Subject: [PATCH 02/13] Update libc --- .drone.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.drone.yml b/.drone.yml index 616d0e5..168e772 100644 --- a/.drone.yml +++ b/.drone.yml @@ -33,6 +33,21 @@ steps: - staticcheck ./... #Todo: fix all the lint errors and add `-set_exit_status` above to enforce linting + - name: build-android + image: openpriv/android-go-mobile:2023.02 + volumes: + - name: deps + path: /go + commands: + - sudo apt update + - sudo apt install libc6-dev + - uname -a + - ldd --version + - go mod download + - gomobile init + - make android + - sha512sum cwtch.aar + - name: build-linux image: golang:1.19.1 volumes: @@ -41,18 +56,6 @@ steps: commands: - make linux - - name: build-android - image: openpriv/android-go-mobile:2023.02 - volumes: - - name: deps - path: /go - commands: - - uname -a - - ldd --version - - go mod download - - gomobile init - - make android - - name: build-windows image: openpriv/mingw-go:2023.01 environment: -- 2.25.1 From 13f354f4a6e173dbb2183ad8c9b96bc4a41afcd1 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Tue, 31 Jan 2023 21:14:21 -0800 Subject: [PATCH 03/13] rep build experiment --- .drone.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 168e772..e3bb17c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -39,10 +39,12 @@ steps: - name: deps path: /go commands: - - sudo apt update - - sudo apt install libc6-dev + - apt update + - apt install libc6-dev - uname -a - ldd --version + - git checkout tags/v1.10.4 -b v1.10.4 + - echo `git describe --tags` > VERSION - go mod download - gomobile init - make android -- 2.25.1 From 7846574b1b93dd4ad2c384886b5e88b058dbc29c Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Tue, 31 Jan 2023 21:19:11 -0800 Subject: [PATCH 04/13] libc --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index e3bb17c..fcf2c7f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,7 +40,7 @@ steps: path: /go commands: - apt update - - apt install libc6-dev + - apt install -y libc6-dev libc6 - uname -a - ldd --version - git checkout tags/v1.10.4 -b v1.10.4 -- 2.25.1 From ddf99ae8eeb5489b6e0ca96da6d95bed23704a28 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Tue, 31 Jan 2023 21:23:51 -0800 Subject: [PATCH 05/13] binary --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index fcf2c7f..1aa52df 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,7 +40,7 @@ steps: path: /go commands: - apt update - - apt install -y libc6-dev libc6 + - apt install -y libc-bin libc6-dev libc6 - uname -a - ldd --version - git checkout tags/v1.10.4 -b v1.10.4 -- 2.25.1 From 6517171f70083a4fdeb872782227ad33a7f88d54 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Tue, 31 Jan 2023 21:32:49 -0800 Subject: [PATCH 06/13] is it cache? --- .drone.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index 1aa52df..0d1e7d2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -39,12 +39,10 @@ steps: - name: deps path: /go commands: - - apt update - - apt install -y libc-bin libc6-dev libc6 - - uname -a - - ldd --version - git checkout tags/v1.10.4 -b v1.10.4 - echo `git describe --tags` > VERSION + - export GOCACHE="/tmp/gocache" + - go env - go mod download - gomobile init - make android -- 2.25.1 From e8313dd9c8d112452a1ffbd1d6a79cc9c88a7c47 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Tue, 31 Jan 2023 21:40:27 -0800 Subject: [PATCH 07/13] java --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 0d1e7d2..84dae2d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -41,8 +41,8 @@ steps: commands: - git checkout tags/v1.10.4 -b v1.10.4 - echo `git describe --tags` > VERSION - - export GOCACHE="/tmp/gocache" - go env + - java -version - go mod download - gomobile init - make android -- 2.25.1 From e1bfa8999c5152593ce11ea153bc33af23e89f74 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Tue, 31 Jan 2023 21:57:20 -0800 Subject: [PATCH 08/13] reinstall gomobile --- .drone.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.drone.yml b/.drone.yml index 84dae2d..17fd47c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -43,6 +43,10 @@ steps: - echo `git describe --tags` > VERSION - go env - java -version + - cd $GOPATH/src/golang.org/x/mobile + - go install -trimpath -ldflags "-buildid=" ./cmd/gomobile + - go install -trimpath -ldflags "-buildid=" ./cmd/gobind + - cd /drone/src/ - go mod download - gomobile init - make android -- 2.25.1 From 26dad1e947bc3f1ca6739bf00e4d0659dabf5ff1 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Tue, 31 Jan 2023 22:06:59 -0800 Subject: [PATCH 09/13] trimpath --- .drone.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.drone.yml b/.drone.yml index 17fd47c..686bee2 100644 --- a/.drone.yml +++ b/.drone.yml @@ -41,15 +41,10 @@ steps: commands: - git checkout tags/v1.10.4 -b v1.10.4 - echo `git describe --tags` > VERSION - - go env - - java -version - - cd $GOPATH/src/golang.org/x/mobile - - go install -trimpath -ldflags "-buildid=" ./cmd/gomobile - - go install -trimpath -ldflags "-buildid=" ./cmd/gobind - - cd /drone/src/ - go mod download - gomobile init - - make android + - ./switch-gomobile.sh + - gomobile bind -target android/arm,android/arm64,android/amd64 -trimpath -ldflags="-buildid=$(git describe --tags) -X cwtch.buildVer=$(git describe --tags) -X cwtch.buildDate=$(git log -1 --format=%cd --date=format:%G-%m-%d-%H-%M)" - sha512sum cwtch.aar - name: build-linux -- 2.25.1 From 24ba1d22c078eb3ccba77ab2b30d33694b9a2ada Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Tue, 31 Jan 2023 22:14:28 -0800 Subject: [PATCH 10/13] git --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 686bee2..f2ca355 100644 --- a/.drone.yml +++ b/.drone.yml @@ -40,7 +40,7 @@ steps: path: /go commands: - git checkout tags/v1.10.4 -b v1.10.4 - - echo `git describe --tags` > VERSION + - git status - go mod download - gomobile init - ./switch-gomobile.sh -- 2.25.1 From fa53ddc4f85ad4d9d546bd6b4d1f05c171cb7569 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Tue, 31 Jan 2023 22:18:31 -0800 Subject: [PATCH 11/13] remove tor --- .drone.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.drone.yml b/.drone.yml index f2ca355..84d930e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -11,9 +11,6 @@ steps: path: /go commands: - go install honnef.co/go/tools/cmd/staticcheck@latest - - wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/tor/tor - - wget https://git.openprivacy.ca/openprivacy/buildfiles/raw/master/tor/torrc - - chmod a+x tor - git fetch --tags #- export GO111MODULE=on #- go mod vendor -- 2.25.1 From 6b8a31082a0b044ee7d471de602c559f76f490e6 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Wed, 1 Feb 2023 11:10:24 -0800 Subject: [PATCH 12/13] 1.10.3 test --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 84d930e..10caa51 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,7 +36,7 @@ steps: - name: deps path: /go commands: - - git checkout tags/v1.10.4 -b v1.10.4 + - git checkout tags/v1.10.3 -b v1.10.3 - git status - go mod download - gomobile init -- 2.25.1 From 2debfa27437597ef64afc95428855daefbcaf6a1 Mon Sep 17 00:00:00 2001 From: Sarah Jamie Lewis Date: Wed, 1 Feb 2023 11:21:13 -0800 Subject: [PATCH 13/13] go env --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 10caa51..4233cb4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -36,11 +36,12 @@ steps: - name: deps path: /go commands: - - git checkout tags/v1.10.3 -b v1.10.3 + - git checkout tags/v1.10.4 -b v1.10.4 - git status - go mod download - gomobile init - ./switch-gomobile.sh + - go env - gomobile bind -target android/arm,android/arm64,android/amd64 -trimpath -ldflags="-buildid=$(git describe --tags) -X cwtch.buildVer=$(git describe --tags) -X cwtch.buildDate=$(git log -1 --format=%cd --date=format:%G-%m-%d-%H-%M)" - sha512sum cwtch.aar -- 2.25.1