From 475a9b153384e815c03adf0a826809c1576d5c9b Mon Sep 17 00:00:00 2001 From: Robert Doering Date: Fri, 4 Jun 2021 11:16:22 +0200 Subject: [PATCH 01/16] try to upload assets --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 3129dc8..5a822c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,6 +10,13 @@ matrix: - go: tip git: submodules: false +deploy: + provider: releases + api_key: ${GITHUB_API_KEY} + file: bin + skip_cleanup: true + on: + tags: true env: global: - secure: WB/4RQ8P5Q8MkGzASC6mFdEwrXVmKoeTlzzMcZh63GuoVk2vPhREvgZKc0o48+b/w3P2kv9NOfr3aFUTNt4fLKqjzAmUb3fKe2ISim727QnS4SMo7UN4Oj+/7ipQqRNR2LO3p01uIbhLVhPs/398i/ZnCjHObcX4cADOO2SwgjRYJw/92+qT80JY7DMIBfzCfKUxz/BV5qqSPMoO2IEUkIXz8oQHo1LD5Bq6Qrfxx8kRbLIFDZASG7CYPR3FOCYuXvAltzrBd0fxW8/VzHgjpjkQHxQuBt95UT3pSuA0MPOFjAUSBQ90MIsRSdqNnvuA+eykgU+QY0Twzt1u2SIJvdGHfU4FnZrwWnnkHVlMnaM/KpsbJ0pGJO078+uZb8S1qq3QMLAzJ6NJSbtZKLPLNMqrIf/Oi/NSCGE8kfU0FMMaC8R8UuGypc218LsUNnkH0vcRx7WNkiOnGd6RTvKOx14k2DnzHJBXwlmAg0PA1wY+kw31hRdIVgeuFYzjSK/0ikZJ3cMy4JREpOtSew15MkpMDAMX9SCo0/xH1H10RRqQcKMVNrMRDxzYuQa4h6GcnTu76fNw/MbWq7JN6KlcKupeK1IJpmorqj/lrywu/fZLJWQPUfkdNOJmzkplVBNVJHYPe3SF4VMLzFnz4qNasRJIk2noXp8eXWv/hOFEzQ8= From b3bde3bf095a7e03dac6ecf1e51d24341f5af064 Mon Sep 17 00:00:00 2001 From: rdoering Date: Sun, 6 Jun 2021 13:15:21 +0200 Subject: [PATCH 02/16] remove encrypted vars --- .travis.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a822c9..f26e22e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,8 +16,4 @@ deploy: file: bin skip_cleanup: true on: - tags: true -env: - global: - - secure: WB/4RQ8P5Q8MkGzASC6mFdEwrXVmKoeTlzzMcZh63GuoVk2vPhREvgZKc0o48+b/w3P2kv9NOfr3aFUTNt4fLKqjzAmUb3fKe2ISim727QnS4SMo7UN4Oj+/7ipQqRNR2LO3p01uIbhLVhPs/398i/ZnCjHObcX4cADOO2SwgjRYJw/92+qT80JY7DMIBfzCfKUxz/BV5qqSPMoO2IEUkIXz8oQHo1LD5Bq6Qrfxx8kRbLIFDZASG7CYPR3FOCYuXvAltzrBd0fxW8/VzHgjpjkQHxQuBt95UT3pSuA0MPOFjAUSBQ90MIsRSdqNnvuA+eykgU+QY0Twzt1u2SIJvdGHfU4FnZrwWnnkHVlMnaM/KpsbJ0pGJO078+uZb8S1qq3QMLAzJ6NJSbtZKLPLNMqrIf/Oi/NSCGE8kfU0FMMaC8R8UuGypc218LsUNnkH0vcRx7WNkiOnGd6RTvKOx14k2DnzHJBXwlmAg0PA1wY+kw31hRdIVgeuFYzjSK/0ikZJ3cMy4JREpOtSew15MkpMDAMX9SCo0/xH1H10RRqQcKMVNrMRDxzYuQa4h6GcnTu76fNw/MbWq7JN6KlcKupeK1IJpmorqj/lrywu/fZLJWQPUfkdNOJmzkplVBNVJHYPe3SF4VMLzFnz4qNasRJIk2noXp8eXWv/hOFEzQ8= - - secure: R9dZFEXM5JU9Pmp5OonAjm3IPZ1lbwcBXuB/SqtnchVpJw0XX0Hf9cVYfDzhzRT19Se90MPuYLW2CgpBoU5O/t2HP0dXhlaDWWTnU3y44+xScMGBjPaBcsSFGFgerbYHw7jQ7QCkgCYYR+UP7Dc1v7tBUMFiDrut6/I86MLTJjW2tOBYRQ7llpedar8bMkgQ+iV+2wIoU+9l6MgKsdC5JLHDPB8BhbSfSc6CgxRyBjmvPpPQwHh+yCgkUKTUCepXpDcMAIQtUPOajvUT4zrKXE5C+vq+WA7lG8MH4aO2QK3jMQIon/sOZOJc+DCRvJqGn/JIwGdpF/w0SfqjsiSbswIp4e17ez6QjCtp5jPzDQPm3U9iXjsU3E3SkjIExXPNXQwEMqEkszyvRIrEx95+y/wYY00oTW8wzZFQDf/XAfwjjcnRRDeor65CwcL+xcV88XUikGUEPsu5V+TESxm3IJDaloh2zqSPwZW+GEeHt2GrvqUoyfj9VT8+DaYU2rkkVASiUiUpFtuOtCkU76A3A2bwxbYgZ/K66b4MqEwnNUBEXt5WZEsc5wmxvGhpO9Crfs4VHgELjm57P8gY2OK7Q9sAMS5JHBq5Ei7vbfto/idyF7fLUwpLxxEnYb2SoCL9ZLBU/bzK1uvQJxHaxb9lqYDmYPwq3MgODi+8CnE6IZ8= + tags: true \ No newline at end of file From 329a423ff7c7e7fdcf7263c339da2f961b607895 Mon Sep 17 00:00:00 2001 From: rdoering Date: Sun, 6 Jun 2021 13:27:34 +0200 Subject: [PATCH 03/16] re-added mysterius globals --- .travis.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f26e22e..5a822c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,4 +16,8 @@ deploy: file: bin skip_cleanup: true on: - tags: true \ No newline at end of file + tags: true +env: + global: + - secure: WB/4RQ8P5Q8MkGzASC6mFdEwrXVmKoeTlzzMcZh63GuoVk2vPhREvgZKc0o48+b/w3P2kv9NOfr3aFUTNt4fLKqjzAmUb3fKe2ISim727QnS4SMo7UN4Oj+/7ipQqRNR2LO3p01uIbhLVhPs/398i/ZnCjHObcX4cADOO2SwgjRYJw/92+qT80JY7DMIBfzCfKUxz/BV5qqSPMoO2IEUkIXz8oQHo1LD5Bq6Qrfxx8kRbLIFDZASG7CYPR3FOCYuXvAltzrBd0fxW8/VzHgjpjkQHxQuBt95UT3pSuA0MPOFjAUSBQ90MIsRSdqNnvuA+eykgU+QY0Twzt1u2SIJvdGHfU4FnZrwWnnkHVlMnaM/KpsbJ0pGJO078+uZb8S1qq3QMLAzJ6NJSbtZKLPLNMqrIf/Oi/NSCGE8kfU0FMMaC8R8UuGypc218LsUNnkH0vcRx7WNkiOnGd6RTvKOx14k2DnzHJBXwlmAg0PA1wY+kw31hRdIVgeuFYzjSK/0ikZJ3cMy4JREpOtSew15MkpMDAMX9SCo0/xH1H10RRqQcKMVNrMRDxzYuQa4h6GcnTu76fNw/MbWq7JN6KlcKupeK1IJpmorqj/lrywu/fZLJWQPUfkdNOJmzkplVBNVJHYPe3SF4VMLzFnz4qNasRJIk2noXp8eXWv/hOFEzQ8= + - secure: R9dZFEXM5JU9Pmp5OonAjm3IPZ1lbwcBXuB/SqtnchVpJw0XX0Hf9cVYfDzhzRT19Se90MPuYLW2CgpBoU5O/t2HP0dXhlaDWWTnU3y44+xScMGBjPaBcsSFGFgerbYHw7jQ7QCkgCYYR+UP7Dc1v7tBUMFiDrut6/I86MLTJjW2tOBYRQ7llpedar8bMkgQ+iV+2wIoU+9l6MgKsdC5JLHDPB8BhbSfSc6CgxRyBjmvPpPQwHh+yCgkUKTUCepXpDcMAIQtUPOajvUT4zrKXE5C+vq+WA7lG8MH4aO2QK3jMQIon/sOZOJc+DCRvJqGn/JIwGdpF/w0SfqjsiSbswIp4e17ez6QjCtp5jPzDQPm3U9iXjsU3E3SkjIExXPNXQwEMqEkszyvRIrEx95+y/wYY00oTW8wzZFQDf/XAfwjjcnRRDeor65CwcL+xcV88XUikGUEPsu5V+TESxm3IJDaloh2zqSPwZW+GEeHt2GrvqUoyfj9VT8+DaYU2rkkVASiUiUpFtuOtCkU76A3A2bwxbYgZ/K66b4MqEwnNUBEXt5WZEsc5wmxvGhpO9Crfs4VHgELjm57P8gY2OK7Q9sAMS5JHBq5Ei7vbfto/idyF7fLUwpLxxEnYb2SoCL9ZLBU/bzK1uvQJxHaxb9lqYDmYPwq3MgODi+8CnE6IZ8= From 2bc4e90fa2296230f056ba5431cbbf9a35534587 Mon Sep 17 00:00:00 2001 From: rdoering Date: Sun, 6 Jun 2021 13:39:26 +0200 Subject: [PATCH 04/16] use master branch only --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5a822c9..d910eaf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,6 +17,8 @@ deploy: skip_cleanup: true on: tags: true +on: + branch: master env: global: - secure: WB/4RQ8P5Q8MkGzASC6mFdEwrXVmKoeTlzzMcZh63GuoVk2vPhREvgZKc0o48+b/w3P2kv9NOfr3aFUTNt4fLKqjzAmUb3fKe2ISim727QnS4SMo7UN4Oj+/7ipQqRNR2LO3p01uIbhLVhPs/398i/ZnCjHObcX4cADOO2SwgjRYJw/92+qT80JY7DMIBfzCfKUxz/BV5qqSPMoO2IEUkIXz8oQHo1LD5Bq6Qrfxx8kRbLIFDZASG7CYPR3FOCYuXvAltzrBd0fxW8/VzHgjpjkQHxQuBt95UT3pSuA0MPOFjAUSBQ90MIsRSdqNnvuA+eykgU+QY0Twzt1u2SIJvdGHfU4FnZrwWnnkHVlMnaM/KpsbJ0pGJO078+uZb8S1qq3QMLAzJ6NJSbtZKLPLNMqrIf/Oi/NSCGE8kfU0FMMaC8R8UuGypc218LsUNnkH0vcRx7WNkiOnGd6RTvKOx14k2DnzHJBXwlmAg0PA1wY+kw31hRdIVgeuFYzjSK/0ikZJ3cMy4JREpOtSew15MkpMDAMX9SCo0/xH1H10RRqQcKMVNrMRDxzYuQa4h6GcnTu76fNw/MbWq7JN6KlcKupeK1IJpmorqj/lrywu/fZLJWQPUfkdNOJmzkplVBNVJHYPe3SF4VMLzFnz4qNasRJIk2noXp8eXWv/hOFEzQ8= From 14c9f88b07bf598d836e0de2537258a830ea9021 Mon Sep 17 00:00:00 2001 From: rdoering Date: Sun, 6 Jun 2021 14:05:08 +0200 Subject: [PATCH 05/16] moved on onto deploy --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d910eaf..2fb2140 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,6 @@ deploy: skip_cleanup: true on: tags: true -on: branch: master env: global: From d9eab4e374582ac43dd5fa0ec4296514fda8f45e Mon Sep 17 00:00:00 2001 From: rdoering Date: Sun, 6 Jun 2021 17:57:45 +0200 Subject: [PATCH 06/16] fix: use build dir for assets --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 2fb2140..aea05c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,8 @@ git: deploy: provider: releases api_key: ${GITHUB_API_KEY} - file: bin + file_glob: true + file: build/* skip_cleanup: true on: tags: true From 6245b9d121411bf62f8e087f61beb575fbadc38b Mon Sep 17 00:00:00 2001 From: rdoering Date: Sun, 6 Jun 2021 18:01:45 +0200 Subject: [PATCH 07/16] use git-tag as version --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index aea05c7..ff37383 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,5 +21,6 @@ deploy: branch: master env: global: + - VERSION: ${TRAVIS_TAG} - secure: WB/4RQ8P5Q8MkGzASC6mFdEwrXVmKoeTlzzMcZh63GuoVk2vPhREvgZKc0o48+b/w3P2kv9NOfr3aFUTNt4fLKqjzAmUb3fKe2ISim727QnS4SMo7UN4Oj+/7ipQqRNR2LO3p01uIbhLVhPs/398i/ZnCjHObcX4cADOO2SwgjRYJw/92+qT80JY7DMIBfzCfKUxz/BV5qqSPMoO2IEUkIXz8oQHo1LD5Bq6Qrfxx8kRbLIFDZASG7CYPR3FOCYuXvAltzrBd0fxW8/VzHgjpjkQHxQuBt95UT3pSuA0MPOFjAUSBQ90MIsRSdqNnvuA+eykgU+QY0Twzt1u2SIJvdGHfU4FnZrwWnnkHVlMnaM/KpsbJ0pGJO078+uZb8S1qq3QMLAzJ6NJSbtZKLPLNMqrIf/Oi/NSCGE8kfU0FMMaC8R8UuGypc218LsUNnkH0vcRx7WNkiOnGd6RTvKOx14k2DnzHJBXwlmAg0PA1wY+kw31hRdIVgeuFYzjSK/0ikZJ3cMy4JREpOtSew15MkpMDAMX9SCo0/xH1H10RRqQcKMVNrMRDxzYuQa4h6GcnTu76fNw/MbWq7JN6KlcKupeK1IJpmorqj/lrywu/fZLJWQPUfkdNOJmzkplVBNVJHYPe3SF4VMLzFnz4qNasRJIk2noXp8eXWv/hOFEzQ8= - secure: R9dZFEXM5JU9Pmp5OonAjm3IPZ1lbwcBXuB/SqtnchVpJw0XX0Hf9cVYfDzhzRT19Se90MPuYLW2CgpBoU5O/t2HP0dXhlaDWWTnU3y44+xScMGBjPaBcsSFGFgerbYHw7jQ7QCkgCYYR+UP7Dc1v7tBUMFiDrut6/I86MLTJjW2tOBYRQ7llpedar8bMkgQ+iV+2wIoU+9l6MgKsdC5JLHDPB8BhbSfSc6CgxRyBjmvPpPQwHh+yCgkUKTUCepXpDcMAIQtUPOajvUT4zrKXE5C+vq+WA7lG8MH4aO2QK3jMQIon/sOZOJc+DCRvJqGn/JIwGdpF/w0SfqjsiSbswIp4e17ez6QjCtp5jPzDQPm3U9iXjsU3E3SkjIExXPNXQwEMqEkszyvRIrEx95+y/wYY00oTW8wzZFQDf/XAfwjjcnRRDeor65CwcL+xcV88XUikGUEPsu5V+TESxm3IJDaloh2zqSPwZW+GEeHt2GrvqUoyfj9VT8+DaYU2rkkVASiUiUpFtuOtCkU76A3A2bwxbYgZ/K66b4MqEwnNUBEXt5WZEsc5wmxvGhpO9Crfs4VHgELjm57P8gY2OK7Q9sAMS5JHBq5Ei7vbfto/idyF7fLUwpLxxEnYb2SoCL9ZLBU/bzK1uvQJxHaxb9lqYDmYPwq3MgODi+8CnE6IZ8= From 77d24e1f4e75b9c0941b7393e406f2b1e120096b Mon Sep 17 00:00:00 2001 From: rdoering Date: Sun, 6 Jun 2021 18:25:37 +0200 Subject: [PATCH 08/16] added windows platform --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index ff37383..c82cfc8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: go os: - linux - osx + - windows go: - 1.15.x script: make build @@ -22,5 +23,6 @@ deploy: env: global: - VERSION: ${TRAVIS_TAG} + # what is this? - secure: WB/4RQ8P5Q8MkGzASC6mFdEwrXVmKoeTlzzMcZh63GuoVk2vPhREvgZKc0o48+b/w3P2kv9NOfr3aFUTNt4fLKqjzAmUb3fKe2ISim727QnS4SMo7UN4Oj+/7ipQqRNR2LO3p01uIbhLVhPs/398i/ZnCjHObcX4cADOO2SwgjRYJw/92+qT80JY7DMIBfzCfKUxz/BV5qqSPMoO2IEUkIXz8oQHo1LD5Bq6Qrfxx8kRbLIFDZASG7CYPR3FOCYuXvAltzrBd0fxW8/VzHgjpjkQHxQuBt95UT3pSuA0MPOFjAUSBQ90MIsRSdqNnvuA+eykgU+QY0Twzt1u2SIJvdGHfU4FnZrwWnnkHVlMnaM/KpsbJ0pGJO078+uZb8S1qq3QMLAzJ6NJSbtZKLPLNMqrIf/Oi/NSCGE8kfU0FMMaC8R8UuGypc218LsUNnkH0vcRx7WNkiOnGd6RTvKOx14k2DnzHJBXwlmAg0PA1wY+kw31hRdIVgeuFYzjSK/0ikZJ3cMy4JREpOtSew15MkpMDAMX9SCo0/xH1H10RRqQcKMVNrMRDxzYuQa4h6GcnTu76fNw/MbWq7JN6KlcKupeK1IJpmorqj/lrywu/fZLJWQPUfkdNOJmzkplVBNVJHYPe3SF4VMLzFnz4qNasRJIk2noXp8eXWv/hOFEzQ8= - secure: R9dZFEXM5JU9Pmp5OonAjm3IPZ1lbwcBXuB/SqtnchVpJw0XX0Hf9cVYfDzhzRT19Se90MPuYLW2CgpBoU5O/t2HP0dXhlaDWWTnU3y44+xScMGBjPaBcsSFGFgerbYHw7jQ7QCkgCYYR+UP7Dc1v7tBUMFiDrut6/I86MLTJjW2tOBYRQ7llpedar8bMkgQ+iV+2wIoU+9l6MgKsdC5JLHDPB8BhbSfSc6CgxRyBjmvPpPQwHh+yCgkUKTUCepXpDcMAIQtUPOajvUT4zrKXE5C+vq+WA7lG8MH4aO2QK3jMQIon/sOZOJc+DCRvJqGn/JIwGdpF/w0SfqjsiSbswIp4e17ez6QjCtp5jPzDQPm3U9iXjsU3E3SkjIExXPNXQwEMqEkszyvRIrEx95+y/wYY00oTW8wzZFQDf/XAfwjjcnRRDeor65CwcL+xcV88XUikGUEPsu5V+TESxm3IJDaloh2zqSPwZW+GEeHt2GrvqUoyfj9VT8+DaYU2rkkVASiUiUpFtuOtCkU76A3A2bwxbYgZ/K66b4MqEwnNUBEXt5WZEsc5wmxvGhpO9Crfs4VHgELjm57P8gY2OK7Q9sAMS5JHBq5Ei7vbfto/idyF7fLUwpLxxEnYb2SoCL9ZLBU/bzK1uvQJxHaxb9lqYDmYPwq3MgODi+8CnE6IZ8= From bf5ae2d2a6a73a425e1e881428d1d4d5fb826b4b Mon Sep 17 00:00:00 2001 From: rdoering Date: Sun, 6 Jun 2021 18:51:18 +0200 Subject: [PATCH 09/16] pre-install install make --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index c82cfc8..a06af82 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,14 @@ os: - linux - osx - windows +before_install: +- |- + case $TRAVIS_OS_NAME in + windows) + [[ ! -f C:/tools/msys64/msys2_shell.cmd ]] && rm -rf C:/tools/msys64 + choco install -y make + ;; + esac go: - 1.15.x script: make build From ffaf3cba407885408200565446a1fe37368a96f9 Mon Sep 17 00:00:00 2001 From: rdoering Date: Sun, 6 Jun 2021 19:06:53 +0200 Subject: [PATCH 10/16] enabled debugging for shell --- scripts/build.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build.sh b/scripts/build.sh index a4a7101..0722b6a 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -1,6 +1,7 @@ #!/bin/bash set -e +set -x # Utility functions lint() { From 0c8d4ae7f3cbe632e97d7f4de0908bc609bf2d40 Mon Sep 17 00:00:00 2001 From: rdoering Date: Sun, 6 Jun 2021 19:14:17 +0200 Subject: [PATCH 11/16] enabled debugging for shell, again --- scripts/build_libgit2.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build_libgit2.sh b/scripts/build_libgit2.sh index 48c0504..128b3fd 100755 --- a/scripts/build_libgit2.sh +++ b/scripts/build_libgit2.sh @@ -1,6 +1,7 @@ #!/bin/sh set -e +set -x DIR=$(pwd) LIBGIT2_PATH=$DIR/libgit2 From fc9cd0825fee17cb3a72d724fa825d316a64c85b Mon Sep 17 00:00:00 2001 From: rdoering Date: Sun, 6 Jun 2021 19:36:18 +0200 Subject: [PATCH 12/16] cat Makefile to debug 'No rule to make target 'install'' --- scripts/build_libgit2.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/build_libgit2.sh b/scripts/build_libgit2.sh index 128b3fd..16019c0 100755 --- a/scripts/build_libgit2.sh +++ b/scripts/build_libgit2.sh @@ -29,6 +29,7 @@ cmake -DTHREADSAFE=ON \ .. cmake --build . +cat Makefile make -j2 install cd $DIR From 9018d8811eaea09ffc4e26f2956e6bdc42d8d074 Mon Sep 17 00:00:00 2001 From: rdoering Date: Sun, 6 Jun 2021 19:48:28 +0200 Subject: [PATCH 13/16] use cmake insteak of make --- scripts/build_libgit2.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/build_libgit2.sh b/scripts/build_libgit2.sh index 16019c0..7a87d9f 100755 --- a/scripts/build_libgit2.sh +++ b/scripts/build_libgit2.sh @@ -29,7 +29,6 @@ cmake -DTHREADSAFE=ON \ .. cmake --build . -cat Makefile -make -j2 install +cmake --install . cd $DIR From 57838653046e02d7c2f1f59d00a5fd8ec0bd9ac5 Mon Sep 17 00:00:00 2001 From: rdoering Date: Sun, 6 Jun 2021 21:03:39 +0200 Subject: [PATCH 14/16] try to use build_win.bat --- .travis.yml | 10 +++++++++- scripts/build_libgit2.sh | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a06af82..64b9fb8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,15 @@ before_install: esac go: - 1.15.x -script: make build +script: + - |- + case $TRAVIS_OS_NAME in + windows) + scripts/build_win.bat + ;; + default) + make build + esac matrix: allow_failures: - go: tip diff --git a/scripts/build_libgit2.sh b/scripts/build_libgit2.sh index 7a87d9f..128b3fd 100755 --- a/scripts/build_libgit2.sh +++ b/scripts/build_libgit2.sh @@ -29,6 +29,6 @@ cmake -DTHREADSAFE=ON \ .. cmake --build . -cmake --install . +make -j2 install cd $DIR From 382af7b2477d521af2427b8aea8682ce7448d982 Mon Sep 17 00:00:00 2001 From: rdoering Date: Sun, 6 Jun 2021 22:08:27 +0200 Subject: [PATCH 15/16] use stages --- .travis.yml | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 64b9fb8..1104b9f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,15 +13,17 @@ before_install: esac go: - 1.15.x -script: - - |- - case $TRAVIS_OS_NAME in - windows) - scripts/build_win.bat - ;; - default) - make build - esac +jobs: + include: + - stage: osx build + os: osx + script: make build + - stage: linux build + os: linux + script: make build + - stage: windows build + os: windows + script: scripts/build_win.bat matrix: allow_failures: - go: tip From 24aab755f449674b6927eae74bb7da4bffd9b79e Mon Sep 17 00:00:00 2001 From: rdoering Date: Sun, 6 Jun 2021 22:31:23 +0200 Subject: [PATCH 16/16] use script --- .travis.yml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1104b9f..01b97ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,17 +13,8 @@ before_install: esac go: - 1.15.x -jobs: - include: - - stage: osx build - os: osx - script: make build - - stage: linux build - os: linux - script: make build - - stage: windows build - os: windows - script: scripts/build_win.bat +script: make build +#script: scripts/build_win.bat matrix: allow_failures: - go: tip