From 111dd72d7bd5f0dd84e5bad6f959386dd9a2e9ff Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 28 Apr 2020 01:08:49 +0300
Subject: Use debian testing for CI

---
 .gitlab-ci.yml | 61 ++++++----------------------------------------------------
 1 file changed, 6 insertions(+), 55 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b52047e..59fd29a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,65 +1,16 @@
-image: golang:alpine
+image: debian:bullseye
 
-variables:
-  CGO_ENABLED: "0"
-
-stages:
-- modules
-- build
-
-cache:
-  paths:
-  - .cache
-
-default:
-  before_script:
-  - apk add git
-  - mkdir -p .cache
-  - export GOPATH="$CI_PROJECT_DIR/.cache"
-
-modules:
-  stage: modules
-  script:
-  - go get
-
-.build: &build
+build:
   stage: build
   cache:
     paths:
     - .cache
+  before_script:
+  - apt-get install -y git libolm-dev
+  - mkdir -p .cache
+  - export GOPATH="$CI_PROJECT_DIR/.cache"
   script:
-  - echo "Building... $GOPATH $CGO_ENABLED $GOOS $GOARCH"
   - go build -o gomuks
   artifacts:
     paths:
     - gomuks
-
-build_linux_amd64:
-  <<: *build
-  variables:
-    GOOS: linux
-    GOARCH: amd64
-
-build_linux_386:
-  <<: *build
-  variables:
-    GOOS: linux
-    GOARCH: "386"
-
-build_linux_arm:
-  <<: *build
-  variables:
-    GOOS: linux
-    GOARCH: arm
-
-build_linux_arm64:
-  <<: *build
-  variables:
-    GOOS: linux
-    GOARCH: arm64
-
-build_darwin_amd64:
-  <<: *build
-  variables:
-    GOOS: darwin
-    GOARCH: amd64
-- 
cgit v1.2.3


From eb17971aa951bc90c5718879e6dd6c8ebae7895a Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 28 Apr 2020 01:10:12 +0300
Subject: Run apt update before installing

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 59fd29a..937cb5b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,6 +6,7 @@ build:
     paths:
     - .cache
   before_script:
+  - apt-get update
   - apt-get install -y git libolm-dev
   - mkdir -p .cache
   - export GOPATH="$CI_PROJECT_DIR/.cache"
-- 
cgit v1.2.3


From 92d4279b216987ebdfbea4577965ffb192e7726a Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 28 Apr 2020 01:11:42 +0300
Subject: Install Go too

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 937cb5b..65864a2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ build:
     - .cache
   before_script:
   - apt-get update
-  - apt-get install -y git libolm-dev
+  - apt-get install -y git libolm-dev golang-go
   - mkdir -p .cache
   - export GOPATH="$CI_PROJECT_DIR/.cache"
   script:
-- 
cgit v1.2.3


From 5d834b2ca3bc99ec575e900fdf1e1b9281156cbb Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 5 May 2020 20:39:14 +0300
Subject: Add static builds without e2ee

---
 .gitlab-ci.yml | 33 +++++++++++++++++++++++++++++----
 1 file changed, 29 insertions(+), 4 deletions(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 65864a2..9d88dd7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
-image: debian:bullseye
-
 build:
   stage: build
+  image: debian:bullseye
   cache:
     paths:
     - .cache
@@ -11,7 +10,33 @@ build:
   - mkdir -p .cache
   - export GOPATH="$CI_PROJECT_DIR/.cache"
   script:
-  - go build -o gomuks
+  - go build -o gomuks_linux_amd64
+  artifacts:
+    paths:
+    - gomuks_linux_amd64
+
+build_static:
+  stage: build
+  image: golang:alpine
+  cache:
+    paths:
+    - .cache
+  before_script:
+  - apk add git
+  - mkdir -p .cache
+  - export GOPATH="$CI_PROJECT_DIR/.cache"
+  variables:
+    CGO_ENABLED: "0"
+  script:
+  - GOOS=linux GOARCH=amd64 go build -o gomuks_linux_amd64
+  - GOOS=linux GOARCH=386 go build -o gomuks_linux_386
+  - GOOS=linux GOARCH=arm go build -o gomuks_linux_arm
+  - GOOS=linux GOARCH=arm64 go build -o gomuks_linux_arm64
+  - GOOS=darwin GOARCH=amd64 go build -o gomuks_darwin_amd64
   artifacts:
     paths:
-    - gomuks
+    - gomuks_linux_amd64
+    - gomuks_linux_386
+    - gomuks_linux_arm
+    - gomuks_linux_arm64
+    - gomuks_darwin_amd64
-- 
cgit v1.2.3


From 44bcf5044be0c3811c04d6210f8e818fe5d6b025 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Tue, 5 May 2020 21:03:37 +0300
Subject: Remove extra git install in CI

---
 .gitlab-ci.yml | 1 -
 1 file changed, 1 deletion(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d88dd7..05097b8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,7 +22,6 @@ build_static:
     paths:
     - .cache
   before_script:
-  - apk add git
   - mkdir -p .cache
   - export GOPATH="$CI_PROJECT_DIR/.cache"
   variables:
-- 
cgit v1.2.3