From 57c7820758dcf36943eff978014b155a9768c383 Mon Sep 17 00:00:00 2001 From: luzbel Date: Mon, 2 Apr 2018 06:01:10 +0200 Subject: [PATCH 1/6] Prueba conjunta travis&appveyor travis genera MacOSX appveyor genera linux y win --- .travis.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c934cd..d0db088 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: cpp branches: - except: - - appveyor + only: + - TravisAndAppVeyor matrix: include: - os: osx @@ -27,3 +27,4 @@ deploy: file: "$ARTIFACT_FILE" on: repo: luzbel/TestTravis + tags: true From 5d2ff73b7f333c0647157c450982d10f3bf50b7f Mon Sep 17 00:00:00 2001 From: luzbel Date: Mon, 2 Apr 2018 06:03:26 +0200 Subject: [PATCH 2/6] Appveyor.yml para esta rama conjunta con Travis --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c73c36b..82c81e7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,7 @@ environment: branches: # whitelist only: - - appveyor + - TravisAndAppVeyor install: - cmd: >- @@ -80,5 +80,5 @@ deploy: draft: false prerelease: true on: - branch: appveyor + branch: TravisAndAppVeyor appveyor_repo_tag: true From f9ed73c9ff508d1450715cb34efc27010a56506a Mon Sep 17 00:00:00 2001 From: luzbel Date: Mon, 2 Apr 2018 06:27:37 +0200 Subject: [PATCH 3/6] Bad repo --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d0db088..e0de5b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,5 +26,5 @@ deploy: secure: XvDPDXt3HhzXsfHdw51JC9fDdIbDma3UAYTCfknpYkQHuMzZtOmwBFX1TNZaKfoqQPni6uEgEKEqMtZULSLG3fY438mLyZ5HRMNMrAMTbsTMxzu5OzjVG1qRoJ0105pnSBZNDTDcgrV88THPKVPirhAmE/REsmoGTiBkab/jWQo55mLcdu8MD7pD+FcRLyIIP0NYw9t5LFCDsh/yH5DQO+XaFsHVK0+NUXqftzV1V59aAE3XTYZH/K/M3UpraMnj5CbvjHhvtSv3+Hn0FAXbezdu1jwZ9zzCbcG0nCNahCEqG0mUW+i10BfqOaQZ3KkjQttk7DLZeaBF8SqDVnNd6uud4z+d+KuZf+vAK7Tm7ydBIGKSt+TVQ2mrQVXtfA+kkDEAEazerUMSUEmijq2gOGgNz1sj2pDWE3699RU9DAbpxf7B3/wBtFxIp73nmFHSxFIAAtNX1kFVg2Ub8YcBj/ZQfNAQnMJ8vCowclhc7IMl/AkTFc+1goS2F7xVhu3invVjPzAXukQkbjFmwMbxjFpHhmE+iAQWvdKqYKnVRhyiwG0Ep4HVhuLi01DFULXqJvauprg1f1JpzqzLkiN//virGWU1bDdOTDnThClpXYsDPj3M8WVv2XUSaslxPfj5nMtvl9rl2FucsQVFzJz2cG4FtDcHPtMotlCWKPRheQs= file: "$ARTIFACT_FILE" on: - repo: luzbel/TestTravis + repo: luzbel/TravisAndAppVeyor tags: true From 069a7f356303d7c59ab0a9914560b1d3d5c3c63a Mon Sep 17 00:00:00 2001 From: luzbel Date: Mon, 2 Apr 2018 06:57:26 +0200 Subject: [PATCH 4/6] Prueba tag especifico "tralari" Por si a travis hay que ponerle en la lista blanca de branches a construir los tags que se creen --- .travis.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e0de5b0..9fbc343 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: cpp branches: only: - TravisAndAppVeyor + - tralari matrix: include: - os: osx @@ -26,5 +27,5 @@ deploy: secure: XvDPDXt3HhzXsfHdw51JC9fDdIbDma3UAYTCfknpYkQHuMzZtOmwBFX1TNZaKfoqQPni6uEgEKEqMtZULSLG3fY438mLyZ5HRMNMrAMTbsTMxzu5OzjVG1qRoJ0105pnSBZNDTDcgrV88THPKVPirhAmE/REsmoGTiBkab/jWQo55mLcdu8MD7pD+FcRLyIIP0NYw9t5LFCDsh/yH5DQO+XaFsHVK0+NUXqftzV1V59aAE3XTYZH/K/M3UpraMnj5CbvjHhvtSv3+Hn0FAXbezdu1jwZ9zzCbcG0nCNahCEqG0mUW+i10BfqOaQZ3KkjQttk7DLZeaBF8SqDVnNd6uud4z+d+KuZf+vAK7Tm7ydBIGKSt+TVQ2mrQVXtfA+kkDEAEazerUMSUEmijq2gOGgNz1sj2pDWE3699RU9DAbpxf7B3/wBtFxIp73nmFHSxFIAAtNX1kFVg2Ub8YcBj/ZQfNAQnMJ8vCowclhc7IMl/AkTFc+1goS2F7xVhu3invVjPzAXukQkbjFmwMbxjFpHhmE+iAQWvdKqYKnVRhyiwG0Ep4HVhuLi01DFULXqJvauprg1f1JpzqzLkiN//virGWU1bDdOTDnThClpXYsDPj3M8WVv2XUSaslxPfj5nMtvl9rl2FucsQVFzJz2cG4FtDcHPtMotlCWKPRheQs= file: "$ARTIFACT_FILE" on: - repo: luzbel/TravisAndAppVeyor + repo: luzbel/TestTravis tags: true From e5f6871b42ea2329cbf43a0efe926b58bced5fea Mon Sep 17 00:00:00 2001 From: luzbel Date: Mon, 2 Apr 2018 07:08:13 +0200 Subject: [PATCH 5/6] se machacaba el valor del artefacto linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit En la sección install, se dejaba siempre a linux cuando en la matriz se definia linux o linux.static según el caso --- appveyor.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 82c81e7..284974b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,9 +32,7 @@ install: mkdir %APPVEYOR_BUILD_FOLDER%\build\ mkdir %APPVEYOR_BUILD_FOLDER%\build\win -- sh: >- - export ARTIFACT_FILE="build/linux/VigasocoSDL-Beta.Linux.zip" - +- sh: >-b sudo apt-get update sudo apt-get install -y libsdl1.2-dev From 77182a17613071e231dfe1c6a12199a2d6e69907 Mon Sep 17 00:00:00 2001 From: luzbel Date: Mon, 2 Apr 2018 07:09:51 +0200 Subject: [PATCH 6/6] se habia quedado una b suelta --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 284974b..5a7f287 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -32,7 +32,7 @@ install: mkdir %APPVEYOR_BUILD_FOLDER%\build\ mkdir %APPVEYOR_BUILD_FOLDER%\build\win -- sh: >-b +- sh: >- sudo apt-get update sudo apt-get install -y libsdl1.2-dev