From e48fe917a3b42828e1dfdd3a47a901718c6c2fcc Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 10:25:37 -0300 Subject: [PATCH 01/97] First try --- .github/workflows/build.yml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 000000000..b1279057f --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,32 @@ +name: Java CI + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 8 + uses: actions/setup-java@v2 + with: + java-version: '8' + distribution: 'adopt' + - name: Cache Maven packages + uses: actions/cache@v2 + with: + path: ~/.m2 + key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} + restore-keys: ${{ runner.os }}-m2 + - name: Build with Maven + run: | + ./wollokInstall.sh + cd org.uqbar.project.wollok.releng/ + export PROFILES=normalProfile + export UPDATE_SITE=none + echo "Running with profiles $PROFILES" + echo "Running with UPDATE_SITE $UPDATE_SITE" + export MAVEN_OPTS=-Xmx2048m + mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES + From 9fc3b592d7d928d68c6e3c9b175ad48bab5bf611 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 10:53:43 -0300 Subject: [PATCH 02/97] Adding settings to Maven --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b1279057f..d02935a94 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,9 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Build with Maven run: | + openssl aes-256-cbc -K $encrypted_1cc7b892dc78_key -iv $encrypted_1cc7b892dc78_iv + -in settings.xml.enc -out settings.xml -d + mv settings.xml ~/.m2/settings.xml ./wollokInstall.sh cd org.uqbar.project.wollok.releng/ export PROFILES=normalProfile @@ -28,5 +31,5 @@ jobs: echo "Running with profiles $PROFILES" echo "Running with UPDATE_SITE $UPDATE_SITE" export MAVEN_OPTS=-Xmx2048m - mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES + mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES -X From 336f87663166f902c66bc3d0c6e3a00f0e24366a Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 10:54:38 -0300 Subject: [PATCH 03/97] Fix build for Github Actions --- .github/workflows/build.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d02935a94..3c94a5717 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Build with Maven run: | - openssl aes-256-cbc -K $encrypted_1cc7b892dc78_key -iv $encrypted_1cc7b892dc78_iv - -in settings.xml.enc -out settings.xml -d + openssl aes-256-cbc -K $encrypted_1cc7b892dc78_key -iv $encrypted_1cc7b892dc78_iv -in settings.xml.enc -out settings.xml -d mv settings.xml ~/.m2/settings.xml ./wollokInstall.sh cd org.uqbar.project.wollok.releng/ @@ -32,4 +31,3 @@ jobs: echo "Running with UPDATE_SITE $UPDATE_SITE" export MAVEN_OPTS=-Xmx2048m mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES -X - From 9e68318a69353216e03e7267d2e9c4515ba582df Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 11:04:04 -0300 Subject: [PATCH 04/97] Removing decryption of settings --- .github/workflows/build.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3c94a5717..db70996b6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,6 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Build with Maven run: | - openssl aes-256-cbc -K $encrypted_1cc7b892dc78_key -iv $encrypted_1cc7b892dc78_iv -in settings.xml.enc -out settings.xml -d - mv settings.xml ~/.m2/settings.xml ./wollokInstall.sh cd org.uqbar.project.wollok.releng/ export PROFILES=normalProfile From 76903fbf47fa3e227d767ea2440603cadd6f9e78 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 11:24:21 -0300 Subject: [PATCH 05/97] adding xvbf for QuickFix tests --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index db70996b6..daa28ca06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,8 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Build with Maven run: | + export DISPLAY=:99.0 + sh -e /etc/init.d/xvfb start ./wollokInstall.sh cd org.uqbar.project.wollok.releng/ export PROFILES=normalProfile From 095a4ebaec60b750f18aefef747984d00667cc04 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 11:28:39 -0300 Subject: [PATCH 06/97] Running xvfb --- .github/workflows/build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index daa28ca06..c097f41d1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,7 +19,7 @@ jobs: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - name: Build with Maven + - name: Preparing Maven Build run: | export DISPLAY=:99.0 sh -e /etc/init.d/xvfb start @@ -30,4 +30,8 @@ jobs: echo "Running with profiles $PROFILES" echo "Running with UPDATE_SITE $UPDATE_SITE" export MAVEN_OPTS=-Xmx2048m - mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES -X + - name: Run Maven build headless + uses: GabrielBB/xvfb-action@v1 + with: + run: mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES -X + \ No newline at end of file From 3f72925da1a6e3d0a36906b2642051fcf41c91de Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 11:29:50 -0300 Subject: [PATCH 07/97] Fix yaml --- wollok-language | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wollok-language b/wollok-language index 4d4e09f8f..35c8fe32d 160000 --- a/wollok-language +++ b/wollok-language @@ -1 +1 @@ -Subproject commit 4d4e09f8ffa7758eabe57ba15c812253b0699cf9 +Subproject commit 35c8fe32d2b1d46f6bbdb8f99df8094e37d84730 From 2a725da401223dbcfd7ab19e6c7ccc5d951b631f Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 11:30:51 -0300 Subject: [PATCH 08/97] Fix yaml 2 --- .github/workflows/build.yml | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c097f41d1..402703deb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,19 +19,18 @@ jobs: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - name: Preparing Maven Build - run: | - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start - ./wollokInstall.sh - cd org.uqbar.project.wollok.releng/ - export PROFILES=normalProfile - export UPDATE_SITE=none - echo "Running with profiles $PROFILES" - echo "Running with UPDATE_SITE $UPDATE_SITE" - export MAVEN_OPTS=-Xmx2048m - - name: Run Maven build headless - uses: GabrielBB/xvfb-action@v1 - with: - run: mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES -X - \ No newline at end of file + - name: Run Maven build headless + uses: GabrielBB/xvfb-action@v1 + with: + run: | + mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES -X + export DISPLAY=:99.0 + sh -e /etc/init.d/xvfb start + ./wollokInstall.sh + cd org.uqbar.project.wollok.releng/ + export PROFILES=normalProfile + export UPDATE_SITE=none + echo "Running with profiles $PROFILES" + echo "Running with UPDATE_SITE $UPDATE_SITE" + export MAVEN_OPTS=-Xmx2048m + \ No newline at end of file From 5d1bcfbd1432f7eb9f9d1efd0eafd85890930446 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 11:32:36 -0300 Subject: [PATCH 09/97] Removing duplicated xvbf --- .github/workflows/build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 402703deb..0e8b57cdf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,9 +23,6 @@ jobs: uses: GabrielBB/xvfb-action@v1 with: run: | - mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES -X - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start ./wollokInstall.sh cd org.uqbar.project.wollok.releng/ export PROFILES=normalProfile @@ -33,4 +30,4 @@ jobs: echo "Running with profiles $PROFILES" echo "Running with UPDATE_SITE $UPDATE_SITE" export MAVEN_OPTS=-Xmx2048m - \ No newline at end of file + mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES -X From 86cf95001ec7af9ef8b10a0246231fef5c167747 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 11:36:27 -0300 Subject: [PATCH 10/97] Trying to install xvbf manually --- .github/workflows/build.yml | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e8b57cdf..588666035 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,15 +19,17 @@ jobs: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - name: Run Maven build headless - uses: GabrielBB/xvfb-action@v1 - with: - run: | - ./wollokInstall.sh - cd org.uqbar.project.wollok.releng/ - export PROFILES=normalProfile - export UPDATE_SITE=none - echo "Running with profiles $PROFILES" - echo "Running with UPDATE_SITE $UPDATE_SITE" - export MAVEN_OPTS=-Xmx2048m - mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES -X + - name: Run Maven Build + run: | + export DISPLAY=:99.0 + sudo apt-get install xvfb + xvfb start + ./wollokInstall.sh + cd org.uqbar.project.wollok.releng/ + export PROFILES=normalProfile + export UPDATE_SITE=none + echo "Running with profiles $PROFILES" + echo "Running with UPDATE_SITE $UPDATE_SITE" + export MAVEN_OPTS=-Xmx2048m + mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES -X + \ No newline at end of file From 118efcfc49dbe234a3e778aa93a168eca8c21c82 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 11:38:01 -0300 Subject: [PATCH 11/97] change xvbf path --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 588666035..f046b5dc9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,8 +22,8 @@ jobs: - name: Run Maven Build run: | export DISPLAY=:99.0 - sudo apt-get install xvfb - xvfb start + sudo apt-get install xvfb -y + /usr/bin/xvfb start ./wollokInstall.sh cd org.uqbar.project.wollok.releng/ export PROFILES=normalProfile From e1beba257b89a3ccfc980b67e851e29bb67c5192 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 11:41:16 -0300 Subject: [PATCH 12/97] Xvfb instead of xvfb --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f046b5dc9..137b2399f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,8 +22,8 @@ jobs: - name: Run Maven Build run: | export DISPLAY=:99.0 - sudo apt-get install xvfb -y - /usr/bin/xvfb start + sudo apt-get install -y xvfb + Xvfb start ./wollokInstall.sh cd org.uqbar.project.wollok.releng/ export PROFILES=normalProfile From 6550aac6026b928dd9bc50781c16c0ca7f4660a1 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 11:44:47 -0300 Subject: [PATCH 13/97] using xvfb script --- .github/workflows/build.yml | 2 +- xvfb.sh | 24 ++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 xvfb.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 137b2399f..e96d785c0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: run: | export DISPLAY=:99.0 sudo apt-get install -y xvfb - Xvfb start + ./xvfb start ./wollokInstall.sh cd org.uqbar.project.wollok.releng/ export PROFILES=normalProfile diff --git a/xvfb.sh b/xvfb.sh new file mode 100755 index 000000000..dee3521ed --- /dev/null +++ b/xvfb.sh @@ -0,0 +1,24 @@ +XVFB=/usr/bin/Xvfb +XVFBARGS=":1 -screen 0 1024x768x24 -ac +extension GLX +render -noreset" +PIDFILE=/var/run/xvfb.pid +case "$1" in + start) + echo -n "Starting virtual X frame buffer: Xvfb" + start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile --background --exec $XVFB -- $XVFBARGS + echo "." + ;; + stop) + echo -n "Stopping virtual X frame buffer: Xvfb" + start-stop-daemon --stop --quiet --pidfile $PIDFILE + echo "." + ;; + restart) + $0 stop + $0 start + ;; + *) + echo "Usage: /etc/init.d/xvfb {start|stop|restart}" + exit 1 +esac + +exit 0 \ No newline at end of file From 8db28f0f6ce6399b2f9bf250b810a7e057d3fe26 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 11:50:41 -0300 Subject: [PATCH 14/97] Fix wollok-language pointer + using sh --- .github/workflows/build.yml | 2 +- wollok-language | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e96d785c0..9f89eb5c4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: run: | export DISPLAY=:99.0 sudo apt-get install -y xvfb - ./xvfb start + ./xvfb.sh start ./wollokInstall.sh cd org.uqbar.project.wollok.releng/ export PROFILES=normalProfile diff --git a/wollok-language b/wollok-language index 35c8fe32d..4d4e09f8f 160000 --- a/wollok-language +++ b/wollok-language @@ -1 +1 @@ -Subproject commit 35c8fe32d2b1d46f6bbdb8f99df8094e37d84730 +Subproject commit 4d4e09f8ffa7758eabe57ba15c812253b0699cf9 From 3a36cda520eb69ddf1add028876c64399203538e Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 17:17:46 -0300 Subject: [PATCH 15/97] Running xvfb with sudo --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9f89eb5c4..daba97b9c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: run: | export DISPLAY=:99.0 sudo apt-get install -y xvfb - ./xvfb.sh start + sudo ./xvfb.sh start ./wollokInstall.sh cd org.uqbar.project.wollok.releng/ export PROFILES=normalProfile From df7d17c7def129ebf8f5f70a61ad3fce1f32492f Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 18:28:20 -0300 Subject: [PATCH 16/97] xvfb embedded --- .github/workflows/build.yml | 26 +++++++++++++------------- xvfb.sh | 24 ------------------------ 2 files changed, 13 insertions(+), 37 deletions(-) delete mode 100755 xvfb.sh diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index daba97b9c..cdb0175db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,16 +20,16 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build - run: | - export DISPLAY=:99.0 - sudo apt-get install -y xvfb - sudo ./xvfb.sh start - ./wollokInstall.sh - cd org.uqbar.project.wollok.releng/ - export PROFILES=normalProfile - export UPDATE_SITE=none - echo "Running with profiles $PROFILES" - echo "Running with UPDATE_SITE $UPDATE_SITE" - export MAVEN_OPTS=-Xmx2048m - mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES -X - \ No newline at end of file + uses: GabrielBB/xvfb-action@v1 + with: + run: | + export DISPLAY=:99.0 + ./wollokInstall.sh + cd org.uqbar.project.wollok.releng/ + export PROFILES=normalProfile + export UPDATE_SITE=none + echo "Running with profiles $PROFILES" + echo "Running with UPDATE_SITE $UPDATE_SITE" + export MAVEN_OPTS=-Xmx2048m + mvn -e --batch-mode --update-snapshots -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES + \ No newline at end of file diff --git a/xvfb.sh b/xvfb.sh deleted file mode 100755 index dee3521ed..000000000 --- a/xvfb.sh +++ /dev/null @@ -1,24 +0,0 @@ -XVFB=/usr/bin/Xvfb -XVFBARGS=":1 -screen 0 1024x768x24 -ac +extension GLX +render -noreset" -PIDFILE=/var/run/xvfb.pid -case "$1" in - start) - echo -n "Starting virtual X frame buffer: Xvfb" - start-stop-daemon --start --quiet --pidfile $PIDFILE --make-pidfile --background --exec $XVFB -- $XVFBARGS - echo "." - ;; - stop) - echo -n "Stopping virtual X frame buffer: Xvfb" - start-stop-daemon --stop --quiet --pidfile $PIDFILE - echo "." - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/xvfb {start|stop|restart}" - exit 1 -esac - -exit 0 \ No newline at end of file From 4d7e10448bebeb51e2c72b25a0e34957db1cf346 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 25 May 2021 18:34:07 -0300 Subject: [PATCH 17/97] xvfb running only for maven script --- .github/workflows/build.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cdb0175db..a2cb5ffda 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,16 +20,16 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build - uses: GabrielBB/xvfb-action@v1 - with: - run: | - export DISPLAY=:99.0 - ./wollokInstall.sh - cd org.uqbar.project.wollok.releng/ - export PROFILES=normalProfile - export UPDATE_SITE=none - echo "Running with profiles $PROFILES" - echo "Running with UPDATE_SITE $UPDATE_SITE" - export MAVEN_OPTS=-Xmx2048m - mvn -e --batch-mode --update-snapshots -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES - \ No newline at end of file + run: | + export DISPLAY=:99.0 + sudo apt-get install -y xvfb + ./wollokInstall.sh + cd org.uqbar.project.wollok.releng/ + export PROFILES=normalProfile + export UPDATE_SITE=none + echo "Running with profiles $PROFILES" + echo "Running with UPDATE_SITE $UPDATE_SITE" + export MAVEN_OPTS=-Xmx2048m + xvfb-run mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES -X + + \ No newline at end of file From 02f26d611c93979c674aedb192dd95483e8f7b1f Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sat, 29 May 2021 11:52:43 -0300 Subject: [PATCH 18/97] WIP --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a2cb5ffda..6ebc1d4fd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,6 @@ jobs: echo "Running with profiles $PROFILES" echo "Running with UPDATE_SITE $UPDATE_SITE" export MAVEN_OPTS=-Xmx2048m - xvfb-run mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES -X - + xvfb-run mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES + \ No newline at end of file From 202a45af7efb7f263d1e240431172f3a3709a47a Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 1 Jun 2021 21:49:05 -0300 Subject: [PATCH 19/97] testing coveralls with secret --- .github/workflows/build.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6ebc1d4fd..3dcbf5f9e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -30,6 +30,12 @@ jobs: echo "Running with profiles $PROFILES" echo "Running with UPDATE_SITE $UPDATE_SITE" export MAVEN_OPTS=-Xmx2048m - xvfb-run mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P $PROFILES + xvfb-run mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' \ + -Dtycho.disableP2Mirrors=false -U \ + -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID \ + clean install jacoco:report \ + --no-transfer-progress \ + -D repoToken=${{ secrets.COVERALLS_TOKEN }} \ + -P $PROFILES \ No newline at end of file From a2aa8714b9206ff061230afa5d9d434aebae68ab Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Wed, 2 Jun 2021 09:04:34 -0300 Subject: [PATCH 20/97] Missing coveralls report --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3dcbf5f9e..5f9500eae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,6 +34,7 @@ jobs: -Dtycho.disableP2Mirrors=false -U \ -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID \ clean install jacoco:report \ + coveralls:report \ --no-transfer-progress \ -D repoToken=${{ secrets.COVERALLS_TOKEN }} \ -P $PROFILES From c62273b7c91cf7bb937781c03c34f671b68974c7 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Wed, 2 Jun 2021 09:32:07 -0300 Subject: [PATCH 21/97] Forcing build to use secret --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5f9500eae..4abe3116b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,4 +39,5 @@ jobs: -D repoToken=${{ secrets.COVERALLS_TOKEN }} \ -P $PROFILES + \ No newline at end of file From 245fc59144326ea3b4c11e8a0035c5a42823b413 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Wed, 2 Jun 2021 19:21:03 -0300 Subject: [PATCH 22/97] Upgrading coveralls plugin --- org.uqbar.project.wollok.releng/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.uqbar.project.wollok.releng/pom.xml b/org.uqbar.project.wollok.releng/pom.xml index f093d01ef..37a57ad1d 100644 --- a/org.uqbar.project.wollok.releng/pom.xml +++ b/org.uqbar.project.wollok.releng/pom.xml @@ -343,7 +343,7 @@ org.eluder.coveralls coveralls-maven-plugin - 3.0.1 + 4.3.0 From 10463ba878d88e3bb7621ba8bbd585c7f6a63386 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Wed, 2 Jun 2021 19:43:17 -0300 Subject: [PATCH 23/97] Deleting space for repoToken --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4abe3116b..46bbc1797 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -36,7 +36,7 @@ jobs: clean install jacoco:report \ coveralls:report \ --no-transfer-progress \ - -D repoToken=${{ secrets.COVERALLS_TOKEN }} \ + -DrepoToken=${{ secrets.COVERALLS_TOKEN }} \ -P $PROFILES From b1839717eef07ccfea902212435088498d6398f0 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Wed, 2 Jun 2021 19:56:09 -0300 Subject: [PATCH 24/97] adding config for coveralls + github inside pom --- org.uqbar.project.wollok.releng/pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/org.uqbar.project.wollok.releng/pom.xml b/org.uqbar.project.wollok.releng/pom.xml index 37a57ad1d..310676a88 100644 --- a/org.uqbar.project.wollok.releng/pom.xml +++ b/org.uqbar.project.wollok.releng/pom.xml @@ -355,6 +355,18 @@ travis-ci ${env.TRAVIS_JOB_ID} + + + + + ${basedir}/target/coverage.xml + + + UTF-8 + github + ${env.repoToken} + + From a35ff5a4251d7f641c95e6a9195431fc54ed0ac7 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Wed, 2 Jun 2021 20:00:50 -0300 Subject: [PATCH 25/97] Passing only repoToken --- org.uqbar.project.wollok.releng/pom.xml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/org.uqbar.project.wollok.releng/pom.xml b/org.uqbar.project.wollok.releng/pom.xml index 310676a88..884746743 100644 --- a/org.uqbar.project.wollok.releng/pom.xml +++ b/org.uqbar.project.wollok.releng/pom.xml @@ -353,20 +353,9 @@ UTF-8 travis-ci - ${env.TRAVIS_JOB_ID} - - - - - - ${basedir}/target/coverage.xml - - - UTF-8 - github ${env.repoToken} + ${env.TRAVIS_JOB_ID} - From a8e4e55a4e6f06e600353f6209f31096f9a13a38 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Wed, 2 Jun 2021 21:39:57 -0300 Subject: [PATCH 26/97] Sending coveralls report only to github --- org.uqbar.project.wollok.releng/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.uqbar.project.wollok.releng/pom.xml b/org.uqbar.project.wollok.releng/pom.xml index 884746743..aa42b7048 100644 --- a/org.uqbar.project.wollok.releng/pom.xml +++ b/org.uqbar.project.wollok.releng/pom.xml @@ -352,7 +352,7 @@ UTF-8 - travis-ci + github ${env.repoToken} ${env.TRAVIS_JOB_ID} From ac8fc7ca1b99ce98452f0b673acadbce8b06ccdc Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Thu, 3 Jun 2021 23:54:41 -0300 Subject: [PATCH 27/97] Adding environment variables --- .github/workflows/build.yml | 6 +++++- org.uqbar.project.wollok.releng/pom.xml | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 46bbc1797..9a3f24111 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -38,6 +38,10 @@ jobs: --no-transfer-progress \ -DrepoToken=${{ secrets.COVERALLS_TOKEN }} \ -P $PROFILES - + env: + CI_NAME: github + BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }} + CI_BUILD_NUMBER: ${{ github.run_id }} + CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks \ No newline at end of file diff --git a/org.uqbar.project.wollok.releng/pom.xml b/org.uqbar.project.wollok.releng/pom.xml index aa42b7048..37a57ad1d 100644 --- a/org.uqbar.project.wollok.releng/pom.xml +++ b/org.uqbar.project.wollok.releng/pom.xml @@ -352,8 +352,7 @@ UTF-8 - github - ${env.repoToken} + travis-ci ${env.TRAVIS_JOB_ID} From b64edef5b27812beb9af5cd95bdb011fb3008a5b Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Fri, 4 Jun 2021 00:00:54 -0300 Subject: [PATCH 28/97] Trying to use github action --- .github/workflows/build.yml | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9a3f24111..6a75383a9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,14 +34,8 @@ jobs: -Dtycho.disableP2Mirrors=false -U \ -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID \ clean install jacoco:report \ - coveralls:report \ - --no-transfer-progress \ - -DrepoToken=${{ secrets.COVERALLS_TOKEN }} \ -P $PROFILES - env: - CI_NAME: github - BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }} - CI_BUILD_NUMBER: ${{ github.run_id }} - CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks - - \ No newline at end of file + - name: Coveralls + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }} From 2b547e9d021694bb8e07577000ef65c8aefa3669 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Fri, 4 Jun 2021 00:09:43 -0300 Subject: [PATCH 29/97] Back to passing repoToken --- .github/workflows/build.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6a75383a9..f5213cc27 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,6 +22,7 @@ jobs: - name: Run Maven Build run: | export DISPLAY=:99.0 + echo COVERALLS_TOKEN ${{ secrets.COVERALLS_TOKEN }} sudo apt-get install -y xvfb ./wollokInstall.sh cd org.uqbar.project.wollok.releng/ @@ -31,11 +32,16 @@ jobs: echo "Running with UPDATE_SITE $UPDATE_SITE" export MAVEN_OPTS=-Xmx2048m xvfb-run mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' \ - -Dtycho.disableP2Mirrors=false -U \ - -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID \ + -D tycho.disableP2Mirrors=false -U \ + -D TRAVIS_JOB_ID=$TRAVIS_JOB_ID \ + -D repoToken=${{ secrets.COVERALLS_TOKEN }} \ + -D serviceName=github \ + -D serviceBuildUrl=https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks \ + -D branch=$BRANCH_NAME \ clean install jacoco:report \ + coveralls:report \ + --no-transfer-progress \ -P $PROFILES - - name: Coveralls - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.GITHUB_TOKEN }} + + + \ No newline at end of file From 36748cf1514fb98c987c6d9612378255445b2324 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Fri, 4 Jun 2021 08:54:01 -0300 Subject: [PATCH 30/97] Disabling coverage report from Coveralls - sending from Github --- .github/workflows/build.yml | 4 ---- .travis.yml | 6 ++++-- org.uqbar.project.wollok.releng/pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f5213cc27..f573280f3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,7 +33,6 @@ jobs: export MAVEN_OPTS=-Xmx2048m xvfb-run mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' \ -D tycho.disableP2Mirrors=false -U \ - -D TRAVIS_JOB_ID=$TRAVIS_JOB_ID \ -D repoToken=${{ secrets.COVERALLS_TOKEN }} \ -D serviceName=github \ -D serviceBuildUrl=https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks \ @@ -42,6 +41,3 @@ jobs: coveralls:report \ --no-transfer-progress \ -P $PROFILES - - - \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index 6af319dbe..bdd718694 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,8 +37,10 @@ script: - echo "Running with UPDATE_SITE $UPDATE_SITE" - export MAVEN_OPTS=-Xmx2048m - mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' -Dtycho.disableP2Mirrors=false - -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install jacoco:report coveralls:report -P - $PROFILES + -U -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean install + # primera versión: Travis ya no manda reportes de cobertura a Coveralls + # jacoco:report coveralls:report + -P $PROFILES - rm -rf /home/travis/.m2/repository/org/uqbar-project - df -h - du -h -d 2 .. diff --git a/org.uqbar.project.wollok.releng/pom.xml b/org.uqbar.project.wollok.releng/pom.xml index 37a57ad1d..5eed87ee3 100644 --- a/org.uqbar.project.wollok.releng/pom.xml +++ b/org.uqbar.project.wollok.releng/pom.xml @@ -352,8 +352,8 @@ UTF-8 - travis-ci - ${env.TRAVIS_JOB_ID} + github + ${env.repoToken} From 2ea7c7d38978f0cc6b1c910ba8c6d3d524cfb560 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Fri, 4 Jun 2021 09:03:38 -0300 Subject: [PATCH 31/97] Trying to use env variable from Github Action --- .github/workflows/build.yml | 2 ++ org.uqbar.project.wollok.releng/pom.xml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f573280f3..bfef12cf7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,3 +41,5 @@ jobs: coveralls:report \ --no-transfer-progress \ -P $PROFILES + env: + COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }} \ No newline at end of file diff --git a/org.uqbar.project.wollok.releng/pom.xml b/org.uqbar.project.wollok.releng/pom.xml index 5eed87ee3..1370c36ac 100644 --- a/org.uqbar.project.wollok.releng/pom.xml +++ b/org.uqbar.project.wollok.releng/pom.xml @@ -353,7 +353,7 @@ UTF-8 github - ${env.repoToken} + ${env.COVERALLS_TOKEN} From 7f5376b9e2c586b70c5216ed184909efda20797a Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Fri, 4 Jun 2021 09:23:15 -0300 Subject: [PATCH 32/97] Another try --- .github/workflows/build.yml | 17 +++++++++++------ org.uqbar.project.wollok.releng/pom.xml | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bfef12cf7..8bec17dfa 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,10 @@ jobs: - name: Run Maven Build run: | export DISPLAY=:99.0 - echo COVERALLS_TOKEN ${{ secrets.COVERALLS_TOKEN }} + # if [ -z "${{ secrets.COVERALLS_TOKEN }}" ]; + # echo "COVERALLS_TOKEN repository secret not set" + # exit 1 + # fi sudo apt-get install -y xvfb ./wollokInstall.sh cd org.uqbar.project.wollok.releng/ @@ -33,13 +36,15 @@ jobs: export MAVEN_OPTS=-Xmx2048m xvfb-run mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' \ -D tycho.disableP2Mirrors=false -U \ - -D repoToken=${{ secrets.COVERALLS_TOKEN }} \ - -D serviceName=github \ - -D serviceBuildUrl=https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks \ - -D branch=$BRANCH_NAME \ + -D repoToken=${{ secrets.GITHUB_TOKEN }} \ clean install jacoco:report \ coveralls:report \ --no-transfer-progress \ -P $PROFILES env: - COVERALLS_TOKEN: ${{ secrets.COVERALLS_TOKEN }} \ No newline at end of file + COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CI_NAME: github + BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }} + CI_BUILD_NUMBER: ${{ github.run_id }} + CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks + CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} diff --git a/org.uqbar.project.wollok.releng/pom.xml b/org.uqbar.project.wollok.releng/pom.xml index 1370c36ac..c99488125 100644 --- a/org.uqbar.project.wollok.releng/pom.xml +++ b/org.uqbar.project.wollok.releng/pom.xml @@ -345,7 +345,7 @@ coveralls-maven-plugin 4.3.0 - + From 972ffb29175d7949e660914fd5545b514153e8e7 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Fri, 4 Jun 2021 19:48:15 -0300 Subject: [PATCH 33/97] Deploy release --- .github/workflows/build.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8bec17dfa..c0b14969e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,10 +22,6 @@ jobs: - name: Run Maven Build run: | export DISPLAY=:99.0 - # if [ -z "${{ secrets.COVERALLS_TOKEN }}" ]; - # echo "COVERALLS_TOKEN repository secret not set" - # exit 1 - # fi sudo apt-get install -y xvfb ./wollokInstall.sh cd org.uqbar.project.wollok.releng/ @@ -41,6 +37,15 @@ jobs: coveralls:report \ --no-transfer-progress \ -P $PROFILES + - uses: "marvinpinto/action-automatic-releases@latest" + with: + repo_token: "${{ secrets.GITHUB_TOKEN }}" + automatic_release_tag: "latest" + prerelease: true + title: "Development Build" + files: | + LICENSE.txt + *.zip env: COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} CI_NAME: github From 42ad7e8932faec4286a9196f499acdc146fe744b Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Fri, 4 Jun 2021 20:08:03 -0300 Subject: [PATCH 34/97] Adding service to github action for coveralls --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c0b14969e..e67a47769 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,6 +32,7 @@ jobs: export MAVEN_OPTS=-Xmx2048m xvfb-run mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' \ -D tycho.disableP2Mirrors=false -U \ + -D service=github \ -D repoToken=${{ secrets.GITHUB_TOKEN }} \ clean install jacoco:report \ coveralls:report \ @@ -48,6 +49,7 @@ jobs: *.zip env: COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} CI_NAME: github BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }} CI_BUILD_NUMBER: ${{ github.run_id }} From 8f0cdc19493a52be95d60a668b7692185493b79a Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Fri, 4 Jun 2021 20:09:06 -0300 Subject: [PATCH 35/97] Adding variables for coveralls --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e67a47769..a02cbe366 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,6 +34,8 @@ jobs: -D tycho.disableP2Mirrors=false -U \ -D service=github \ -D repoToken=${{ secrets.GITHUB_TOKEN }} \ + -D serviceBuildUrl=https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks \ + -D branch=$BRANCH_NAME \ clean install jacoco:report \ coveralls:report \ --no-transfer-progress \ From 51a9ab65a51ba9ed753d81f30c465c18a9f61a50 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Fri, 4 Jun 2021 20:12:40 -0300 Subject: [PATCH 36/97] Fix typo in build phase --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a02cbe366..ee7da066f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: -D service=github \ -D repoToken=${{ secrets.GITHUB_TOKEN }} \ -D serviceBuildUrl=https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks \ - -D branch=$BRANCH_NAME \ + -D branch=$BRANCH_NAME \ clean install jacoco:report \ coveralls:report \ --no-transfer-progress \ From 69e92c034c76fd6489ad1f9e0b142dda02dd299b Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Fri, 4 Jun 2021 20:22:33 -0300 Subject: [PATCH 37/97] Fix missing env variables for maven coveralls plugin --- .github/workflows/build.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ee7da066f..6120ca88b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,14 +32,19 @@ jobs: export MAVEN_OPTS=-Xmx2048m xvfb-run mvn -e -Darguments='-Dtycho.disableP2Mirrors=false' \ -D tycho.disableP2Mirrors=false -U \ - -D service=github \ -D repoToken=${{ secrets.GITHUB_TOKEN }} \ - -D serviceBuildUrl=https://github.com/${{ github.repository }}/commit/${{ github.sha }}/checks \ - -D branch=$BRANCH_NAME \ clean install jacoco:report \ coveralls:report \ --no-transfer-progress \ -P $PROFILES + env: + COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CI_NAME: github + BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }} + CI_BUILD_NUMBER: ${{ github.run_id }} + CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks + CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} - uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" @@ -49,11 +54,3 @@ jobs: files: | LICENSE.txt *.zip - env: - COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CI_NAME: github - BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }} - CI_BUILD_NUMBER: ${{ github.run_id }} - CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks - CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} From 09409835468f849edc68d0ce513883f7f5ed17f2 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sat, 5 Jun 2021 08:00:46 -0300 Subject: [PATCH 38/97] Releases: trying to add zip files generated --- .github/workflows/build.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6120ca88b..fb0e81f1d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,12 +45,11 @@ jobs: CI_BUILD_NUMBER: ${{ github.run_id }} CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} - - uses: "marvinpinto/action-automatic-releases@latest" + - name: Release + uses: softprops/action-gh-release@v1 + if: startsWith(github.ref, 'refs/tags/') with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" - automatic_release_tag: "latest" - prerelease: true - title: "Development Build" files: | - LICENSE.txt - *.zip + **.zip + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file From 4763c8c5e4f5b8564937e866e0042fc331a3d80f Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sat, 5 Jun 2021 08:47:58 -0300 Subject: [PATCH 39/97] Fix ** to automatic release --- .github/workflows/build.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fb0e81f1d..e1aefa15d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,11 +45,12 @@ jobs: CI_BUILD_NUMBER: ${{ github.run_id }} CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} - - name: Release - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') + - uses: "marvinpinto/action-automatic-releases@latest" with: + repo_token: "${{ secrets.GITHUB_TOKEN }}" + automatic_release_tag: "latest" + prerelease: true + title: "Development Build" files: | **.zip - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + From 028808f060260b48aa665a457cfdb43072d06699 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sat, 5 Jun 2021 09:43:52 -0300 Subject: [PATCH 40/97] Uploading only executables zip --- .github/workflows/build.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1aefa15d..69a0e2299 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -52,5 +52,8 @@ jobs: prerelease: true title: "Development Build" files: | - **.zip + **/wollok-linux*64.zip + **/wollok-macosx*64.zip + **/wollok-win32*64.zip + From d7e84443405ead25dcb2eb67a44a5c7f7895f02e Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sat, 5 Jun 2021 10:11:32 -0300 Subject: [PATCH 41/97] Adding extra action for tags releasing --- .github/workflows/build.yml | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 69a0e2299..99ad50496 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -55,5 +55,12 @@ jobs: **/wollok-linux*64.zip **/wollok-macosx*64.zip **/wollok-win32*64.zip - - + - uses: "marvinpinto/action-automatic-releases@latest" + if: startsWith(github.ref, 'refs/tags/') + with: + repo_token: "${{ secrets.GITHUB_TOKEN }}" + prerelease: false + files: | + **/wollok-linux*64.zip + **/wollok-macosx*64.zip + **/wollok-win32*64.zip From f9563c7ee40d26ee9a3c0309d6ddd34aa327ad28 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 18:19:48 -0300 Subject: [PATCH 42/97] Decrypting and using settings.xml --- .github/workflows/build.yml | 8 ++++++-- .gitignore | 3 +++ settings.xml.enc | Bin 1120 -> 0 bytes settings.xml.gpg | Bin 0 -> 634 bytes 4 files changed, 9 insertions(+), 2 deletions(-) delete mode 100644 settings.xml.enc create mode 100644 settings.xml.gpg diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 99ad50496..fe3c0616a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,8 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | + gpg --decrypt --batch --yes --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} --output /tmp/settings.xml settings.xml.gpg + mv /tmp/settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb ./wollokInstall.sh @@ -45,7 +47,8 @@ jobs: CI_BUILD_NUMBER: ${{ github.run_id }} CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} - - uses: "marvinpinto/action-automatic-releases@latest" + - name: Releasing Latest Development Version + uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" automatic_release_tag: "latest" @@ -55,7 +58,8 @@ jobs: **/wollok-linux*64.zip **/wollok-macosx*64.zip **/wollok-win32*64.zip - - uses: "marvinpinto/action-automatic-releases@latest" + - name: Product Release + uses: "marvinpinto/action-automatic-releases@latest" if: startsWith(github.ref, 'refs/tags/') with: repo_token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.gitignore b/.gitignore index b3604fb01..7656daf46 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,6 @@ scripts/wollok-cli # Ignoring wollok-language files org.uqbar.project.wollok.lib/src/wollok/*.wlk + +# Ignoring settings.xml just because it should be decrypted +settings.xml diff --git a/settings.xml.enc b/settings.xml.enc deleted file mode 100644 index 864ab09f842e61047f750fb8437fb144246babfe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1120 zcmV-m1fTl`a^^qo5(q-EV?ey^61LCpXskxiRmTvyt`4sntKYy5KAy0U$_7gZ37hpj zG+SY8HKWUVYgVx_V57+7S;en|z$MGNuoA-sVOyX46=^fa4lD*NA1ycT8bSgGBlzVG z#UQ7<3NJiC73($_T~JJdtN{z%e#bW|DXCBIu!7MU5!bm5h!lZhMJ+#ZMXUvDovBhpK*}=c^H>#AY;9)696Xx&QsQ zYAaQX>nKciMqBPC>@Ze;=_)Lj$THFMXn6~|P4ngzBE*vQHsF~#XL@U&lKUYvJ_l^e zZj;bf85)54XfDArE-p0+cx0A*Upw35;@h%NU)rR~t27O;R<$qm)5Sa( zeSepeZ0*NtWpy@EhC74TtA*D_mFAs1#HeA=*c5u>BJn4o9XL`xpC(JQgCO4EN_=A3 zSPvJ7c*wQ|bIHo#*%d&_O2_A;XPpcPq)>`dzO=0S+kI&$U-d-akXIE?tZa_r;vX)= zi&wCZVaPz@5f7Qsl~?a`D>eI(uU3~Rir(oR7M@uWyCQ_Qvr+2`ADPO|sS+nb^N&bu zM)|Tk3wDjGai|k%_f#(09r%;VcYt1`)uU@cit2Sc&)v=BA65l+PTVc&O zi8lWLQ>$qk81S*HaN)+K$3~1~6}r9hovGwzyd=owFS|nZ)J2i`K<~Wxz1v}n<{B$3 zhSED&#Tsqgu#C+w5v4+`W75@c@y?yQW#$WeKEM2hJ>G+@jD3@UVLAB);`bxdC)@fh zFx^&QWFRDK&b!|5(34lIz10OXCu01IT7K;}4i|2=FMC9Z}2cMQ`Af#4Uvz@_0H29o>D2Dyw8 zo=r{WeaHw43qpFBU>mo5{k0`U!8qasu$F^TiumW4Uj}x{_a^`?SJ9JD6?V*3m0Q!@ zR;y)B`leLC*!QuQbMEt(ZHqzRUWV8scSHo~;(Y89QQd-;^ z%NJOpYvmS(&qXM=&)vXE?fUQWm{5~RWN6XT$0)wj<^++L1VxTDsm!M0Y75I40=&6b zxdy{pl?uH*_q8J~dq8{q<+v|?lOTc@OIziAB=yt;tAI+tcVHN5-C zHEfC16_sD@hw^y$^+AbrN@$3J*)5)mvU@p&cgHxHII=_qk(JPZ@{h~0*z~g|F7^IE mCCQn;js@+1>w!F+vVk5V+}I#YuigKJngwa+M-158pgEQUUNXx7 diff --git a/settings.xml.gpg b/settings.xml.gpg new file mode 100644 index 0000000000000000000000000000000000000000..41972461aa3f6b273d9487b9b7986d052d40f833 GIT binary patch literal 634 zcmV-=0)_pI4Fm}T0&`Mf)-e}NEC15z0bpV<&C>_L2ML5X+N1n5)CETtH43bw&#JAV z;6-*EXk^B)pfe;4*VV%d+Q00W6o;d z_d(kXg2!#D6iJSee-ypMC_dp?1NFtu#ro&0IUM9tdD|Ydt@4H^*b-Cu`Kczv&5);P z0$bUahn>*_rD&Yt=6yR!%`P0gF&LQJq2uQ(a?}ay?^()HEqPyzKzQ*gNny5ANKTe< zFnU3ejvda>VFL)OPLMhB>|#%a+>;LPorIO(Fxo5y}vtih* z|Jz0XC!b;lyIRBh_M3qTE!Ld?k%faiT3UfCf1r4xDE0$I<7b|c!xl?Hb^cn!nfn9f-MryL^bCB{qH=ZgCHjx zO__$5wm|Wx`f)LElM*dAM|)?U>D3?%$Y6H(>2h;@Tv{_r=MGrMl$@PE3X6Wx+WIXxc7)<9QVPi<}Z)aZyUs zy$$vEzCh2R!(^m59#%Dn`F{rlYbxVJxLAS UCk}ycKyXxNdE?f5zm=(vi)~gi-~a#s literal 0 HcmV?d00001 From cdff52f90867f04594a4fbeb1287461781478fac Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 18:24:26 -0300 Subject: [PATCH 43/97] testing gpg again --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fe3c0616a..520922c4c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,8 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | - gpg --decrypt --batch --yes --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} --output /tmp/settings.xml settings.xml.gpg - mv /tmp/settings.xml ~/.m2/settings.xml + gpg --batch --yes --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} --output ./settings.xml --decrypt settings.xml.gpg + mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb ./wollokInstall.sh From 795344c5216d81e0a927f272cdb000a5a9c50ba4 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 18:28:51 -0300 Subject: [PATCH 44/97] gpg: changing params --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 520922c4c..b01a48b12 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | - gpg --batch --yes --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} --output ./settings.xml --decrypt settings.xml.gpg + gpg --batch --yes --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} -o ./settings.xml -d settings.xml.gpg mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb From fdfc54e8f0fab746f8c0bcfc4a2cc5be3de99e8a Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 18:31:00 -0300 Subject: [PATCH 45/97] gpg fix --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b01a48b12..01a2df5cb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | - gpg --batch --yes --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} -o ./settings.xml -d settings.xml.gpg + gpg --decrypt --batch --yes --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} -o ./settings.xml settings.xml.gpg mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb From a996cf1acb5ecac016e26fc0a1eb8c776f022bf6 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 18:36:03 -0300 Subject: [PATCH 46/97] Forcing gnupg install --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 01a2df5cb..cb79269d6 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | + sudo apt-get install -y gnupg gpg --decrypt --batch --yes --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} -o ./settings.xml settings.xml.gpg mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 From 4d3c688c35fa2d6d4340c8f7b6003632fcba0cd5 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 18:37:25 -0300 Subject: [PATCH 47/97] Back to --decrypt at end --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb79269d6..fc1023d1b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: - name: Run Maven Build run: | sudo apt-get install -y gnupg - gpg --decrypt --batch --yes --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} -o ./settings.xml settings.xml.gpg + gpg --batch --yes --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} -o ./settings.xml --decrypt settings.xml.gpg mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb From 25c6c95e69e855530f2c4df1937ad28b2b8f152e Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 18:41:15 -0300 Subject: [PATCH 48/97] Confusing gpg arg parser --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc1023d1b..2ad737ba5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | - sudo apt-get install -y gnupg - gpg --batch --yes --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} -o ./settings.xml --decrypt settings.xml.gpg + gpg batch yes passphrase {{ secrets.SETTINGS_GPG_TOKEN }} -o ./settings.xml decrypt settings.xml.gpg mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb From 57f706a3cd9ff3d5af39fe64d022b61ea13a872d Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 18:45:43 -0300 Subject: [PATCH 49/97] Using options file for gpg --- .github/workflows/build.yml | 2 +- settings.config | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 settings.config diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2ad737ba5..2436df08f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | - gpg batch yes passphrase {{ secrets.SETTINGS_GPG_TOKEN }} -o ./settings.xml decrypt settings.xml.gpg + gpg --options settings.config --decrypt settings.xml.gpg mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb diff --git a/settings.config b/settings.config new file mode 100644 index 000000000..6792bf1c3 --- /dev/null +++ b/settings.config @@ -0,0 +1 @@ +--batch --yes --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} -o ./settings.xml \ No newline at end of file From c5b9b3da59775030f6e4201817c1d126d34f924c Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 18:48:12 -0300 Subject: [PATCH 50/97] Checking gpg token --- .github/workflows/build.yml | 3 ++- settings.config | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 settings.config diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2436df08f..037a6f29a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,8 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | - gpg --options settings.config --decrypt settings.xml.gpg + echo "GPG TOKEN {{ secrets.SETTINGS_GPG_TOKEN }}" + gpg --batch --yes --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} -o ./settings.xml --decrypt settings.xml.gpg mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb diff --git a/settings.config b/settings.config deleted file mode 100644 index 6792bf1c3..000000000 --- a/settings.config +++ /dev/null @@ -1 +0,0 @@ ---batch --yes --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} -o ./settings.xml \ No newline at end of file From d3be28e48b09a1b1b708bca2426b2f35b7714b11 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 18:53:05 -0300 Subject: [PATCH 51/97] Testing with -d --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 037a6f29a..d85415ff4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,8 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | - echo "GPG TOKEN {{ secrets.SETTINGS_GPG_TOKEN }}" - gpg --batch --yes --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} -o ./settings.xml --decrypt settings.xml.gpg + echo "GPG TOKEN ${{ secrets.SETTINGS_GPG_TOKEN }}" + gpg -d --passphrase "{{ secrets.SETTINGS_GPG_TOKEN }}" --batch --yes settings.xml.gpg > ./settings.xml mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb From 49309c04993330bbe38aa543e4b3adeb6e8254c3 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 18:55:53 -0300 Subject: [PATCH 52/97] Checking if quotes were the problem --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d85415ff4..3338f6217 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | - echo "GPG TOKEN ${{ secrets.SETTINGS_GPG_TOKEN }}" - gpg -d --passphrase "{{ secrets.SETTINGS_GPG_TOKEN }}" --batch --yes settings.xml.gpg > ./settings.xml + gpg -d --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} --batch --yes settings.xml.gpg > ./settings.xml mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb From bf34aa629390ed2baee0e95331c89080b52ba67b Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 18:56:04 -0300 Subject: [PATCH 53/97] Adding gpg version --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3338f6217..ca6ce1eb4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | + gpg --version gpg -d --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} --batch --yes settings.xml.gpg > ./settings.xml mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 From 8cb4f2a52b99edba68463f57fcbd447291b2861a Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 18:58:03 -0300 Subject: [PATCH 54/97] Simplyfing args for gpg --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ca6ce1eb4..82d04cfee 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,7 +22,7 @@ jobs: - name: Run Maven Build run: | gpg --version - gpg -d --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} --batch --yes settings.xml.gpg > ./settings.xml + gpg -d --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} settings.xml.gpg > ./settings.xml mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb From b2fc12d6f3feb9844684763fea49d39877b70a56 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 19:00:09 -0300 Subject: [PATCH 55/97] trying magical params --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 82d04cfee..e5b0dab99 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,8 +21,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | - gpg --version - gpg -d --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} settings.xml.gpg > ./settings.xml + gpg -d --passphrase "{{ secrets.SETTINGS_GPG_TOKEN }}" --batch --yes --pinentry-mode loopback settings.xml.gpg > ./settings.xml mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb From 2c6d0538d6e53a806b80658254e287bb00e5aa22 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 19:05:07 -0300 Subject: [PATCH 56/97] Testing again without quotes --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e5b0dab99..dd7fafa4f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | - gpg -d --passphrase "{{ secrets.SETTINGS_GPG_TOKEN }}" --batch --yes --pinentry-mode loopback settings.xml.gpg > ./settings.xml + gpg --batch --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} --decrypt settings.xml.gpg > ./settings.xml mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb From 39e1ed72e888201521a7ae7892c51a4af7ba3f0f Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 19:06:42 -0300 Subject: [PATCH 57/97] GPG mad 1 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dd7fafa4f..150d6e72e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | - gpg --batch --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} --decrypt settings.xml.gpg > ./settings.xml + gpg -d --batch --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} settings.xml.gpg > ./settings.xml mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb From 6c22cb0b253f8f97431e391f9aff69264b05a4d7 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 19:10:42 -0300 Subject: [PATCH 58/97] GPG mad 2 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 150d6e72e..6607d1c8d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | - gpg -d --batch --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} settings.xml.gpg > ./settings.xml + gpg --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} --decrypt settings.xml.gpg > ./settings.xml mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb From 87ba59d983ad90a12899c6659ad037eed9a67989 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 19:25:38 -0300 Subject: [PATCH 59/97] Replacing gpg by openssl --- .github/workflows/build.yml | 2 +- settings.xml.enc | Bin 0 -> 2288 bytes settings.xml.gpg | Bin 634 -> 0 bytes 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 settings.xml.enc delete mode 100644 settings.xml.gpg diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6607d1c8d..e407d191c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | - gpg --passphrase {{ secrets.SETTINGS_GPG_TOKEN }} --decrypt settings.xml.gpg > ./settings.xml + openssl aes-256-cbc -pass pass:kry68hbu102 -pbkdf2 -in ./settings.xml.enc -out ./settings.xml -d mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb diff --git a/settings.xml.enc b/settings.xml.enc new file mode 100644 index 0000000000000000000000000000000000000000..f239fced02fcb557ba8997b07923f8f72a2c97fd GIT binary patch literal 2288 zcmV1&rf?0{sP~;uJUMZt4J~Cv z#P^m%Jfw4X_6)@Yz1~wrsf@8rC@k^3J?pWT(LxzEDMgd#4}9!D-&5eMt>EeTFu-Hq zatF`);<~lbwydUjwWtZ)^fi{jSW!Y*GhJTCPk=A))J{SB6GMC%kuZem|@#te5%0l|CpV^J7i#s>) zc`s0?M(ST^MC}I*3I$0q+cLqM#o7ElR?lhd$;BhT+s-ap{;MJssiwIo@u?RI zA!e8Ns2Xb+R)`+CQ6vxD!*4_vH)nSt3F3Z4L{jd@nZQ|UEXC9t%tGkvz6;QXd~D34GjQy`&d;5(3x%pWM z%l9lMDB>wS4&uMFo2h|s})F;!$f#-nKl(f{XANudCECg*#&{=W`bLIAnx zs<8izDM&yh_adE}hN?>{+(|JAX0*xS5>G^MN-Ob~XI%ax07dqw3&8MfO|k7_5SN~( z`r!ygGR9ab;G)*JL=;>=VY=|MG5=F2Hx40!eX^u2_UyuXVU3<__@t(~e~HVXrV#4f zU`B!1kBz_3QvqHPr^_`=ZSkL**Ty#URyNGHFaE}y)Z2a#Fm_EVE%hT`cJU4d z6isRD@;;WRMO+#wSIlyGt|VLl7GYO(g&abj`o}dq68)fStq$PTaOV>&C%4;t{%F0@z5w$^n=#{ml~} zmTiH#A6?aqvfFDSdQTtK0B|?JBHAp6md{4vhfC)Dq}n@V_&XG$ykiqpz8$cmbe^Zk z(yn?85|4o7lz6vUVB&YS6k(nMT1zxxk|Ca?@)cVhcT_r;R$_p~#-&0!|Z zktSpqR2{Lr1b+NB#_ed=Iu_wMmG#4aGrR3W`Ti^uJr#QlI7a+bQfKJ*{2UBBJ!Ftj zF1X)quns2lISJ|Ke?&66Wu8|WioCAS--ba^fYHNaV~$4Ee?0CBevkyK0%oN|nz2`5 zCHYE|Y(-q}HQy|JvX(H%M@({vdZz-DtwN=_TyGUf9x$Gz-p)Hx#}gO{YJ7vBI;#<<1m)aI;XF&_z)=NpEsvLb-ga?Y+8__X|_dzI&%3_Sz zqbZy=ngsvLQXr7{niOccWKl=xeG@he55liTrtn5j`btoetZhmaeb{jUmi+cA95MA`~ie4_`<_Y?pEkVi4nZq~Pt zRIVUvPEDE~Wr{Ma6LZI|n>0DvI+|UIKqX$b@1=I7Z?M{G0=wX{h&11I^hgV4Tv(l6 znp0MSop|HiEx^HZa3RieQx*a3$+OPNZ3bRYXX-+AZvE}k;=l9Wl>3)156(sYw-F&* z1-#G*$4ki>v{R(A>;RL&<9W2=%>uAq{=>ij6Y8&x zOrEAHOS%0}jDb+AiGAZfz&R1da0d|eIGu#G)6+~vAxzFz{6%Y+Y{>swx|2aCUt83U zaIA`dzths5#g%4; z#kxt*3;wJ)Q6d8jgc|~#!4%9PVLdjY-)|6@yOx<(zYc(QN;<3+CHWkIpcXi;5GFZ(>_1qsoMJBFQ4sEGGFHZE>;5=N0uMsHikx9PAYM`kGF_5z0) z=P!AAw?U?To+wdS%-xBOgN(xbI#kt$JHJ1&ooMTsEhWfk)39rCK`dKndd+ zjUXU)o*GxOl;|~}u`(jck!55=|g_NF^{9a+`v zdxdky9R4e8Y&~SH{z2G3U(eI!Lu?i4Wgb@){t?S8^ozS8(Hj>*gtx{+d~X(|KMT|i Kw`N6Sk31u+++x50 literal 0 HcmV?d00001 diff --git a/settings.xml.gpg b/settings.xml.gpg deleted file mode 100644 index 41972461aa3f6b273d9487b9b7986d052d40f833..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 634 zcmV-=0)_pI4Fm}T0&`Mf)-e}NEC15z0bpV<&C>_L2ML5X+N1n5)CETtH43bw&#JAV z;6-*EXk^B)pfe;4*VV%d+Q00W6o;d z_d(kXg2!#D6iJSee-ypMC_dp?1NFtu#ro&0IUM9tdD|Ydt@4H^*b-Cu`Kczv&5);P z0$bUahn>*_rD&Yt=6yR!%`P0gF&LQJq2uQ(a?}ay?^()HEqPyzKzQ*gNny5ANKTe< zFnU3ejvda>VFL)OPLMhB>|#%a+>;LPorIO(Fxo5y}vtih* z|Jz0XC!b;lyIRBh_M3qTE!Ld?k%faiT3UfCf1r4xDE0$I<7b|c!xl?Hb^cn!nfn9f-MryL^bCB{qH=ZgCHjx zO__$5wm|Wx`f)LElM*dAM|)?U>D3?%$Y6H(>2h;@Tv{_r=MGrMl$@PE3X6Wx+WIXxc7)<9QVPi<}Z)aZyUs zy$$vEzCh2R!(^m59#%Dn`F{rlYbxVJxLAS UCk}ycKyXxNdE?f5zm=(vi)~gi-~a#s From 64a815eb632b522ec0956903b9bb9c55c015fa63 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 19:28:01 -0300 Subject: [PATCH 60/97] Deleting jfernandes local repo :) --- settings.xml.enc | Bin 2288 -> 2224 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/settings.xml.enc b/settings.xml.enc index f239fced02fcb557ba8997b07923f8f72a2c97fd..be1fd98e917256c9e67256ff21338f65c2e1602c 100644 GIT binary patch literal 2224 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 Kw`N6Sk31u+++x50 From 9969df23fcadc51a06c18305f94524031b31a550 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 22:21:53 -0300 Subject: [PATCH 61/97] testing wollok-cli update --- .github/workflows/build.yml | 4 ++ .gitignore | 7 ++++ scripts/updateRestOfWollokRepos | 64 +++++++++++++++--------------- scripts/wollokcli_key.enc | Bin 4420 -> 2672 bytes scripts/wolloksite_key.enc | 68 -------------------------------- 5 files changed, 43 insertions(+), 100 deletions(-) delete mode 100644 scripts/wolloksite_key.enc diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e407d191c..2b943ed31 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,6 +39,10 @@ jobs: coveralls:report \ --no-transfer-progress \ -P $PROFILES + cd scripts + chmod 777 ./updateRestOfWollokRepos + "./updateRestOfWollokRepos" + cd .. env: COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 7656daf46..a3482c9fa 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,10 @@ org.uqbar.project.wollok.lib/src/wollok/*.wlk # Ignoring settings.xml just because it should be decrypted settings.xml + +# Ignoring private & public keys +wollok-cli_rsa +wollok-cli_rsa.pub +wollok-site_rsa +wollok-site_rsa.pub + diff --git a/scripts/updateRestOfWollokRepos b/scripts/updateRestOfWollokRepos index c293ed28d..3d0ab7160 100755 --- a/scripts/updateRestOfWollokRepos +++ b/scripts/updateRestOfWollokRepos @@ -1,6 +1,6 @@ -openssl aes-256-cbc -k "$travis_key_password" -d -md sha256 -a -in wolloksite_key.enc -out /tmp/wolloksite_key -openssl aes-256-cbc -k "$travis_key_password" -d -md sha256 -a -in wollokcli_key.enc -out /tmp/wollokcli_key -chmod 600 /tmp/wolloksite_key +# openssl aes-256-cbc -k "$travis_key_password" -d -md sha256 -a -in wolloksite_key.enc -out /tmp/wolloksite_key +openssl aes-256-cbc -k "${{ secrets.WOLLOK_CLI_TOKEN }}" -d -md sha256 -a -in wollokcli_key.enc -out /tmp/wollokcli_key +# chmod 600 /tmp/wolloksite_key chmod 600 /tmp/wollokcli_key cp ssh_config ~/.ssh/config eval `ssh-agent -s` @@ -16,30 +16,30 @@ echo "Copying Wollok library files into libs folder" mkdir -p ./libs cp ../org.uqbar.project.wollok.lib/src/wollok/*.wlk ./libs -echo "****************************************************************************" -echo "Cloning Wollok Site repo" -git clone git@wollok_site:uqbar-project/wollok-site.git -rm ./wollok-site/documentacion/wollokdoc/*.html -rm ./wollok-site/documentacion/wollokDoc.md -mkdir -p ./wollok-site/documentacion/wollokdoc +# echo "****************************************************************************" +# echo "Cloning Wollok Site repo" +# git clone git@wollok_site:uqbar-project/wollok-site.git +# rm ./wollok-site/documentacion/wollokdoc/*.html +# rm ./wollok-site/documentacion/wollokDoc.md +# mkdir -p ./wollok-site/documentacion/wollokdoc -echo "Updating spanish WollokDoc files" -java -cp "./wollok-cli/jars/*" org.uqbar.project.wollok.wollokDoc.WollokDocParser "./libs" -folder "./wollok-site/documentacion/wollokdoc" -locale "es" +# echo "Updating spanish WollokDoc files" +# java -cp "./wollok-cli/jars/*" org.uqbar.project.wollok.wollokDoc.WollokDocParser "./libs" -folder "./wollok-site/documentacion/wollokdoc" -locale "es" -echo -echo "List of files generated" -ls ./wollok-site/documentacion/wollokdoc +# echo +# echo "List of files generated" +# ls ./wollok-site/documentacion/wollokdoc # generamos la documentación en inglés # no copiamos el wollokDoc.md, si hay nuevos archivos o se elimina alguno hay que # ajustarlo manualmente -echo "Updating english WollokDoc files" -java -cp "./wollok-cli/jars/*" org.uqbar.project.wollok.wollokDoc.WollokDocParser "./libs" -folder "./wollok-site/en/documentation/wollokdoc" -locale "en" +# echo "Updating english WollokDoc files" +# java -cp "./wollok-cli/jars/*" org.uqbar.project.wollok.wollokDoc.WollokDocParser "./libs" -folder "./wollok-site/en/documentation/wollokdoc" -locale "en" -echo -echo "List of files generated" -ls ./wollok-site/en/documentation/wollokdoc -echo "****************************************************************************" +# echo +# echo "List of files generated" +# ls ./wollok-site/en/documentation/wollokdoc +# echo "****************************************************************************" echo "List of wollok-cli files updated" cd wollok-cli @@ -49,22 +49,22 @@ echo "" echo "============================================================================" echo "Pushing wollok-cli files" git add . -git commit -m "Updating Wollok JARs library from Travis Job $TRAVIS_JOB_ID" +git commit -m "Updating Wollok JARs library from Github Action => $GITHUB_JOB" git push -v origin master echo "****************************************************************************" # alias ssh='ssh -F <(cat .ssh/config /tmp/wolloksite_key)' -cd ../wollok-site -echo $TRAVIS_JOB_ID > wollok-site.lastUpdated -echo "List of wollok-site files updated" -git status -echo "" -echo "============================================================================" -echo "Pushing wollok-site files" -git add . -git commit -m "Updating Wollokdoc files from Travis Job $TRAVIS_JOB_ID" -git push -v origin master -echo "****************************************************************************" +# cd ../wollok-site +# echo $TRAVIS_JOB_ID > wollok-site.lastUpdated +# echo "List of wollok-site files updated" +# git status +# echo "" +# echo "============================================================================" +# echo "Pushing wollok-site files" +# git add . +# git commit -m "Updating Wollokdoc files from Travis Job $TRAVIS_JOB_ID" +# git push -v origin master +# echo "****************************************************************************" echo "...done" exit 0 \ No newline at end of file diff --git a/scripts/wollokcli_key.enc b/scripts/wollokcli_key.enc index 98abb1a50ad6ff48dec845b67b0e9e1dccdc7cfb..ce94d4fe2e0c81faad4ac5783137b627672202b0 100644 GIT binary patch literal 2672 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 literal 4420 zcmWldwYIE45Jhu-g#fn@hrwMk28Y3&uYdO?9d*)cRh_+02dK0aa@fZR8lNEn zMBRPJf#fA0nbGkObzTHh-XXver1PAVBbk6xL3fwcisYO9ppuKEO zZZd~gZ4)$|6Uz_9Q;-4lDdM>IhDp3}#woP9ggOKm=QDHN2D7_q$ar*z*1O2f{X22h zHg;wglzTS^d!oz$aER!PV%x)Owp#G9M5YMQCy*C){4D>nEoxBZSvi}3IO!0exkUE4 z&d?5pcn%}6K+OeMXzOx(xejZ5>{yRC^7jR^r$U*VuB)-p25t=T;xjX>PZ)c+4`@Kn zQAOJyo&)5pcYmFPi#*XpolPZ)e{+})QP>eyiznx?5x5g@%DtX-w?-80l19onr7^Yv>88V+y#SsE$BNvZ zPgid?T0+&!8MOU9F~=nnq%$)5l}_?^FbRQvbORp3er=`YQigmG#uk9WvX~D^p8^vL z^5h}VrAb=ZksA?2ui-5}54Fq;90`|BH|_P7L%`MNZkSUM@swwvm?9 zle(pt)!E8WkI-sPFbI&OD9RM?!V*NAU0RPOH#xpS0T<;?<^9}yw4Gij>hCH~qB+_h z-+tRW#)>Xb$;rzs(s;}XqCjsGbb;xAKR8}!siPj+l1&eYzZ zB9AnWF=}*0GKeYj+Q661JcWZtDGxRQ($`w>de@;59I?3VHP9@YkIzj87dt+pI%gzx zn;Fcki?x#;Rhye1$HHE=S8AAIKrCCB)O^3Y{IIGHN`3cy(k;R?n5=BV=4gKQ(gQ`U zgobjoO^Zzv%ujBl@ff&|Uja??TbR_0W{j6Wut49E%9{Q4xdpsGAJfkJ&pC_U1Fwnu zMfI*!E{bBC#iecUH46)P_l1@>Vzd-k?ZE&!YLn0lUXwYkMBmqL9o1?=sDdB-yI1$B zO5)aLKTH19;af2?(1SDV+0}N<6Bg!==4PwTTJ~?9Kij5tKhTGM+@i4uuOAITp=MIB zE@Cr*CQl#Rn*b3k{Z=%C@|#W|^Wodt&&p@BEVk8ul#ctgh`Qqah3J`z$%m}R311=k zWg_KHqBa1&_tIzD-|#=W&!xLL)Ko+%k4CI}J4Mfr^7JHh8ou41&yjdIOhCgRylYBi<7pNvncr5zZN?bz z2B1~DO9ZJk@=WvA>ty@-?^pTEH(YKWT#hmUxESn zs@bQPX}#lH5i69a>Z#b3+GdWHq4;%aMN#x&5W1&g1Qr(`H!d17Cyu_fb*pXx->~9F z=2Wwo1lxJowqz8tigD1BrVirB;0O|W5}Vv8NMtb#h7F`s)@^^a;(ml=1@gy6F%;YL zl|H4ledo4*POF;_W81#qhw*;h9=e48)X^*iaO~>5&`2->Pr?PxmJL8^xEMnCU6!Au z?9#g}@$NeF7bCOnw+w+IgvQz9TRKcv@ip3f>M?=?k6t5;q|9Gn6X5iB6Obo#WPj&0 z1ig8K$x)`s&mUafl@0=GMplwma2b7HfxbRE4&J@-bzPv*Uw$ zjnID_uFtnp-B<}xi6Y3{A5wp*36J>+z4cLYL$U{q4|=;l48%kbW28AaNPb6-ocK%5 z+K}j3-eIgrXtVFXzK5^3B}b>@$t+1S*_TxjK=o#>3=Fmf7L@i1tn{Ev}kJ!^rkYMK01>hzZlFPoo+)d^BaQCfAH!AWj}7>PQ^e- z6-FZCyY6KoMkwy~rLb$M5HOEFqpXl$26e(uf$jMa6n3V0{f658)M_h_tI3hf2UBu~ zct;TaLB#S!-Ordi1swn;x8v!#;(w!ok@l<@XYTcwf2j7 zzOl&)E#mLa4$wJ%`#CfG#kMLUt#5AqXP{#ri|-cu&{IEUj!oNj+$D@#{a?!t^+p#u zAxlG}+66Ak8XW_SW9h*kANMQ{3(Am5d6gS3NZd!-jP!VXl%3ps{kM#gmPfL=D>6ByD}0G8sW&rc-KhO_U{{ z=^RS_mA+@b3zSsF)f%{+J6e|GNXzrt-t;!CBl6#57_%;h@9WxEK;>d6K3<5T=)xYh zuQsOAk{!Ha*>~JMEhCv;csHnf2c?vM?|T}*=m(!tk)X_s%7NXj4DeoFvNz;}pZta~ z8+S!tW4Iz)@xDihh^B6I@6=}HMnjPwFz~k2>t6L6W7Podky_edTY|>3Pk*WJD5)mp z4rk(6vTL$j;6yHC9rRFS3;O3BLCfJng4skS>OuwsGe}tzuN&2Cc)v9D?SQx%y!!B# z+*mOv^It0XoR(TxuX7X^d7u=GTG^$_N^36%44*vQ8t-SIcSXG25yB%IHgvN%%WLI2PC6tS$~_dGEuOCc?+r z&spm2vfW6EccS3ou4`l*_kbcN%Z2>VPD;^_R)<#wrR>$}h>U2sCkx@p5SWS1;h$iE zSRw07%?OeTU4M_J8u~%lv~VYgY#?l?@bM-1zl4vYj|M*tAFu=rlKWPVPJ|;!SFHM! zq+PIbyYpx3Q7ufD6w}{do*J5>n%9HRpIM;=BgLi&H)C Date: Sun, 6 Jun 2021 23:28:45 -0300 Subject: [PATCH 62/97] Fix cd scripts --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2b943ed31..4ad61751f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: coveralls:report \ --no-transfer-progress \ -P $PROFILES - cd scripts + cd ../scripts chmod 777 ./updateRestOfWollokRepos "./updateRestOfWollokRepos" cd .. From b1b724de07d34618b892431d67f66cd949485624 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 23:39:59 -0300 Subject: [PATCH 63/97] Using env --- .github/workflows/build.yml | 1 + scripts/updateRestOfWollokRepos | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4ad61751f..a11b2da3e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -51,6 +51,7 @@ jobs: CI_BUILD_NUMBER: ${{ github.run_id }} CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} + WOLLOK_CLI_TOKEN: ${{ secrets.WOLLOK_CLI_TOKEN }} - name: Releasing Latest Development Version uses: "marvinpinto/action-automatic-releases@latest" with: diff --git a/scripts/updateRestOfWollokRepos b/scripts/updateRestOfWollokRepos index 3d0ab7160..3eafc038e 100755 --- a/scripts/updateRestOfWollokRepos +++ b/scripts/updateRestOfWollokRepos @@ -1,5 +1,5 @@ # openssl aes-256-cbc -k "$travis_key_password" -d -md sha256 -a -in wolloksite_key.enc -out /tmp/wolloksite_key -openssl aes-256-cbc -k "${{ secrets.WOLLOK_CLI_TOKEN }}" -d -md sha256 -a -in wollokcli_key.enc -out /tmp/wollokcli_key +openssl aes-256-cbc -k "$WOLLOK_CLI_TOKEN" -d -md sha256 -a -in wollokcli_key.enc -out /tmp/wollokcli_key # chmod 600 /tmp/wolloksite_key chmod 600 /tmp/wollokcli_key cp ssh_config ~/.ssh/config From da37f464f554cc84e22236389290182ae39ed6d0 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Sun, 6 Jun 2021 23:54:47 -0300 Subject: [PATCH 64/97] Testing openssl --- scripts/updateRestOfWollokRepos | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/updateRestOfWollokRepos b/scripts/updateRestOfWollokRepos index 3eafc038e..ffccbabd1 100755 --- a/scripts/updateRestOfWollokRepos +++ b/scripts/updateRestOfWollokRepos @@ -1,7 +1,10 @@ # openssl aes-256-cbc -k "$travis_key_password" -d -md sha256 -a -in wolloksite_key.enc -out /tmp/wolloksite_key -openssl aes-256-cbc -k "$WOLLOK_CLI_TOKEN" -d -md sha256 -a -in wollokcli_key.enc -out /tmp/wollokcli_key +echo Decrypting wollok-cli key +echo "12412412 $WOLLOK_CLI_TOKEN" +openssl aes-256-cbc -k $WOLLOK_CLI_TOKEN -d -md sha256 -a -in wollokcli_key.enc -out /tmp/wollokcli_key # chmod 600 /tmp/wolloksite_key chmod 600 /tmp/wollokcli_key +echo Copying config to .ssh cp ssh_config ~/.ssh/config eval `ssh-agent -s` From fb103b714c48911f970d2856261a0a7aa3be644c Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 00:05:50 -0300 Subject: [PATCH 65/97] Testing wollokcli part --- .github/workflows/build.yml | 4 ++++ scripts/ssh_config | 4 ++-- scripts/updateRestOfWollokRepos | 6 ++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a11b2da3e..0abdfe5ae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,10 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | + cd ../scripts + chmod 777 ./updateRestOfWollokRepos + "./updateRestOfWollokRepos" + exit 0 openssl aes-256-cbc -pass pass:kry68hbu102 -pbkdf2 -in ./settings.xml.enc -out ./settings.xml -d mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 diff --git a/scripts/ssh_config b/scripts/ssh_config index 50650d94f..a24d4d82b 100644 --- a/scripts/ssh_config +++ b/scripts/ssh_config @@ -1,11 +1,11 @@ Host wollok_cli HostName github.com PreferredAuthentications publickey - IdentityFile /tmp/wollokcli_key + IdentityFile ~/.ssh/wollokcli_key IdentitiesOnly yes Host wollok_site HostName github.com PreferredAuthentications publickey - IdentityFile /tmp/wolloksite_key + IdentityFile ~/.ssh/wolloksite_key IdentitiesOnly yes \ No newline at end of file diff --git a/scripts/updateRestOfWollokRepos b/scripts/updateRestOfWollokRepos index ffccbabd1..899c59774 100755 --- a/scripts/updateRestOfWollokRepos +++ b/scripts/updateRestOfWollokRepos @@ -1,9 +1,7 @@ # openssl aes-256-cbc -k "$travis_key_password" -d -md sha256 -a -in wolloksite_key.enc -out /tmp/wolloksite_key -echo Decrypting wollok-cli key -echo "12412412 $WOLLOK_CLI_TOKEN" -openssl aes-256-cbc -k $WOLLOK_CLI_TOKEN -d -md sha256 -a -in wollokcli_key.enc -out /tmp/wollokcli_key +openssl aes-256-cbc -k $WOLLOK_CLI_TOKEN -d -md sha256 -a -in wollokcli_key.enc -out ~/.ssh/wollokcli_key # chmod 600 /tmp/wolloksite_key -chmod 600 /tmp/wollokcli_key +chmod 600 ~/.ssh/wollokcli_key echo Copying config to .ssh cp ssh_config ~/.ssh/config eval `ssh-agent -s` From 7ccfc4a6eaa08969d5737d3795913880edb94b14 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 00:08:17 -0300 Subject: [PATCH 66/97] Fix cd --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0abdfe5ae..073bd5e21 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | - cd ../scripts + cd scripts chmod 777 ./updateRestOfWollokRepos "./updateRestOfWollokRepos" exit 0 From 8bb1dff7bf7b9aefb276846cd67ffd74cc196e1a Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 00:15:17 -0300 Subject: [PATCH 67/97] Test 1 --- .github/workflows/build.yml | 6 +++--- scripts/updateRestOfWollokRepos | 4 ---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 073bd5e21..cf42ebd29 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,9 +21,9 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Run Maven Build run: | - cd scripts - chmod 777 ./updateRestOfWollokRepos - "./updateRestOfWollokRepos" + openssl aes-256-cbc -k $WOLLOK_CLI_TOKEN -d -md sha256 -a -in ./wollokcli_key.enc -out ~/.ssh/wollokcli_key + chmod 600 ~/.ssh/wollokcli_key + cp ssh_config ~/.ssh/config exit 0 openssl aes-256-cbc -pass pass:kry68hbu102 -pbkdf2 -in ./settings.xml.enc -out ./settings.xml -d mv ./settings.xml ~/.m2/settings.xml diff --git a/scripts/updateRestOfWollokRepos b/scripts/updateRestOfWollokRepos index 899c59774..f931bf3bf 100755 --- a/scripts/updateRestOfWollokRepos +++ b/scripts/updateRestOfWollokRepos @@ -1,9 +1,5 @@ # openssl aes-256-cbc -k "$travis_key_password" -d -md sha256 -a -in wolloksite_key.enc -out /tmp/wolloksite_key -openssl aes-256-cbc -k $WOLLOK_CLI_TOKEN -d -md sha256 -a -in wollokcli_key.enc -out ~/.ssh/wollokcli_key # chmod 600 /tmp/wolloksite_key -chmod 600 ~/.ssh/wollokcli_key -echo Copying config to .ssh -cp ssh_config ~/.ssh/config eval `ssh-agent -s` echo "Cloning wollok-cli repo..." From f14ee8e80b74a74c0e695a6347d59c0affd06ded Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 00:17:43 -0300 Subject: [PATCH 68/97] Test 2 --- .github/workflows/build.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cf42ebd29..9264b89fb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,12 +19,13 @@ jobs: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - name: Run Maven Build + - name: Updating wollok-cli run: | - openssl aes-256-cbc -k $WOLLOK_CLI_TOKEN -d -md sha256 -a -in ./wollokcli_key.enc -out ~/.ssh/wollokcli_key + openssl aes-256-cbc -k $WOLLOK_CLI_TOKEN -d -md sha256 -a -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key chmod 600 ~/.ssh/wollokcli_key - cp ssh_config ~/.ssh/config - exit 0 + cp scripts/ssh_config ~/.ssh/config + - name: Run Maven Build + run: | openssl aes-256-cbc -pass pass:kry68hbu102 -pbkdf2 -in ./settings.xml.enc -out ./settings.xml -d mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 From 43dbcd4f462230d3ce90ec9e8523a67189f45f7c Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 00:22:23 -0300 Subject: [PATCH 69/97] Test 3 --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 9264b89fb..5ada5225e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,12 +21,12 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Updating wollok-cli run: | - openssl aes-256-cbc -k $WOLLOK_CLI_TOKEN -d -md sha256 -a -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key + openssl aes-256-cbc -pass pass: ${{ secrets.WOLLOK_CLI_TOKEN }} -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key chmod 600 ~/.ssh/wollokcli_key cp scripts/ssh_config ~/.ssh/config - name: Run Maven Build run: | - openssl aes-256-cbc -pass pass:kry68hbu102 -pbkdf2 -in ./settings.xml.enc -out ./settings.xml -d + openssl aes-256-cbc -pass pass: ${{ secrets.SETTINGS_GPG_TOKEN }} -pbkdf2 -in ./settings.xml.enc -out ./settings.xml -d mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb From 4ee463d994a86d91e8fff3531dd0728ff4b89d1f Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 00:24:07 -0300 Subject: [PATCH 70/97] Test 4 --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5ada5225e..a33d166ac 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,8 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Updating wollok-cli run: | - openssl aes-256-cbc -pass pass: ${{ secrets.WOLLOK_CLI_TOKEN }} -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key + openssl aes-256-cbc -pass pass: ${{ secrets.SETTINGS_GPG_TOKEN }} -pbkdf2 -in ./settings.xml.enc -out ./settings.xml -d + openssl aes-256-cbc -pass pass: ${{ secrets.WOLLOK_CLI_TOKEN }} -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key -d chmod 600 ~/.ssh/wollokcli_key cp scripts/ssh_config ~/.ssh/config - name: Run Maven Build From bdfe6a8a0c1827b1b6490a926afc2f187da64832 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 00:27:18 -0300 Subject: [PATCH 71/97] Test 4 --- .github/workflows/build.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a33d166ac..074c96bae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,13 +21,12 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Updating wollok-cli run: | - openssl aes-256-cbc -pass pass: ${{ secrets.SETTINGS_GPG_TOKEN }} -pbkdf2 -in ./settings.xml.enc -out ./settings.xml -d - openssl aes-256-cbc -pass pass: ${{ secrets.WOLLOK_CLI_TOKEN }} -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key -d - chmod 600 ~/.ssh/wollokcli_key cp scripts/ssh_config ~/.ssh/config + openssl aes-256-cbc -pass pass:${{ secrets.WOLLOK_CLI_TOKEN }} -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key -d + chmod 600 ~/.ssh/wollokcli_key - name: Run Maven Build run: | - openssl aes-256-cbc -pass pass: ${{ secrets.SETTINGS_GPG_TOKEN }} -pbkdf2 -in ./settings.xml.enc -out ./settings.xml -d + openssl aes-256-cbc -pass pass:${{ secrets.SETTINGS_GPG_TOKEN }} -pbkdf2 -in ./settings.xml.enc -out ./settings.xml -d mv ./settings.xml ~/.m2/settings.xml export DISPLAY=:99.0 sudo apt-get install -y xvfb From d6f98ce734a232f49d880a7d1939bb009ed39c52 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 00:28:47 -0300 Subject: [PATCH 72/97] Test 5 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 074c96bae..340c24230 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Updating wollok-cli run: | - cp scripts/ssh_config ~/.ssh/config + cp ./scripts/ssh_config ~/.ssh/config openssl aes-256-cbc -pass pass:${{ secrets.WOLLOK_CLI_TOKEN }} -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key -d chmod 600 ~/.ssh/wollokcli_key - name: Run Maven Build From 6471790f123c64af069b4e797ca248cabd27581b Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 00:30:38 -0300 Subject: [PATCH 73/97] Test 6 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 340c24230..e89d33d7d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,9 +21,9 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Updating wollok-cli run: | - cp ./scripts/ssh_config ~/.ssh/config openssl aes-256-cbc -pass pass:${{ secrets.WOLLOK_CLI_TOKEN }} -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key -d chmod 600 ~/.ssh/wollokcli_key + cp ./scripts/ssh_config ~/.ssh/config - name: Run Maven Build run: | openssl aes-256-cbc -pass pass:${{ secrets.SETTINGS_GPG_TOKEN }} -pbkdf2 -in ./settings.xml.enc -out ./settings.xml -d From b4e2620f10d22a95b7bc3604639f6f9974a0788f Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 00:35:06 -0300 Subject: [PATCH 74/97] Test 7 --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e89d33d7d..07c7f36b0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,8 @@ jobs: restore-keys: ${{ runner.os }}-m2 - name: Updating wollok-cli run: | + mkdir ~/.ssh + chmod 755 ~/.ssh openssl aes-256-cbc -pass pass:${{ secrets.WOLLOK_CLI_TOKEN }} -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key -d chmod 600 ~/.ssh/wollokcli_key cp ./scripts/ssh_config ~/.ssh/config From 4b8d6fccd3b9df97024681fdfbf65ce500df1010 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 00:39:19 -0300 Subject: [PATCH 75/97] Testing wollok-cli user --- .github/workflows/build.yml | 9 +++++---- ...pdateRestOfWollokRepos => updateRestOfWollokRepos.sh} | 0 2 files changed, 5 insertions(+), 4 deletions(-) rename scripts/{updateRestOfWollokRepos => updateRestOfWollokRepos.sh} (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 07c7f36b0..580506ad1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,7 +25,11 @@ jobs: chmod 755 ~/.ssh openssl aes-256-cbc -pass pass:${{ secrets.WOLLOK_CLI_TOKEN }} -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key -d chmod 600 ~/.ssh/wollokcli_key - cp ./scripts/ssh_config ~/.ssh/config + cd ./scripts + cp ./ssh_config ~/.ssh/config + chmod 777 ./updateRestOfWollokRepos.sh + "./updateRestOfWollokRepos.sh" + cd .. - name: Run Maven Build run: | openssl aes-256-cbc -pass pass:${{ secrets.SETTINGS_GPG_TOKEN }} -pbkdf2 -in ./settings.xml.enc -out ./settings.xml -d @@ -46,9 +50,6 @@ jobs: coveralls:report \ --no-transfer-progress \ -P $PROFILES - cd ../scripts - chmod 777 ./updateRestOfWollokRepos - "./updateRestOfWollokRepos" cd .. env: COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/scripts/updateRestOfWollokRepos b/scripts/updateRestOfWollokRepos.sh similarity index 100% rename from scripts/updateRestOfWollokRepos rename to scripts/updateRestOfWollokRepos.sh From 9d67b231fef6e497464c6ecb9ea695c914228794 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 00:49:12 -0300 Subject: [PATCH 76/97] Test 8 --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 580506ad1..d86dfb02b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,7 @@ jobs: chmod 755 ~/.ssh openssl aes-256-cbc -pass pass:${{ secrets.WOLLOK_CLI_TOKEN }} -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key -d chmod 600 ~/.ssh/wollokcli_key + ls ~/.ssh cd ./scripts cp ./ssh_config ~/.ssh/config chmod 777 ./updateRestOfWollokRepos.sh From c9a349bce9f22dc9afcfd1f3058c7689d80ec47e Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 00:51:11 -0300 Subject: [PATCH 77/97] Test 9 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d86dfb02b..03486a60c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,9 +25,9 @@ jobs: chmod 755 ~/.ssh openssl aes-256-cbc -pass pass:${{ secrets.WOLLOK_CLI_TOKEN }} -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key -d chmod 600 ~/.ssh/wollokcli_key - ls ~/.ssh cd ./scripts cp ./ssh_config ~/.ssh/config + ls -la ~/.ssh chmod 777 ./updateRestOfWollokRepos.sh "./updateRestOfWollokRepos.sh" cd .. From f33add1bcf58d61c48383c0d7e377653b706a050 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 00:56:14 -0300 Subject: [PATCH 78/97] Test 10 --- .github/workflows/build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 03486a60c..6c41b09ea 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,10 +24,9 @@ jobs: mkdir ~/.ssh chmod 755 ~/.ssh openssl aes-256-cbc -pass pass:${{ secrets.WOLLOK_CLI_TOKEN }} -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key -d - chmod 600 ~/.ssh/wollokcli_key + chmod 644 ~/.ssh/wollokcli_key cd ./scripts cp ./ssh_config ~/.ssh/config - ls -la ~/.ssh chmod 777 ./updateRestOfWollokRepos.sh "./updateRestOfWollokRepos.sh" cd .. From 7f08ccbd9b31b57218f08a054fd01eb832ca7936 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 00:58:26 -0300 Subject: [PATCH 79/97] Test 11 --- .github/workflows/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6c41b09ea..0582f6227 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,12 +24,13 @@ jobs: mkdir ~/.ssh chmod 755 ~/.ssh openssl aes-256-cbc -pass pass:${{ secrets.WOLLOK_CLI_TOKEN }} -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key -d - chmod 644 ~/.ssh/wollokcli_key + chmod 600 ~/.ssh/wollokcli_key cd ./scripts cp ./ssh_config ~/.ssh/config chmod 777 ./updateRestOfWollokRepos.sh "./updateRestOfWollokRepos.sh" cd .. + exit 1 - name: Run Maven Build run: | openssl aes-256-cbc -pass pass:${{ secrets.SETTINGS_GPG_TOKEN }} -pbkdf2 -in ./settings.xml.enc -out ./settings.xml -d From 9c02a8d6ca9cbbe1bd136411d276bb1c44fb1c66 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 01:08:09 -0300 Subject: [PATCH 80/97] Fix private key --- .gitignore | 8 ++++---- scripts/wollokcli_rsa.enc | Bin 0 -> 3408 bytes 2 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 scripts/wollokcli_rsa.enc diff --git a/.gitignore b/.gitignore index a3482c9fa..e5eb708b0 100644 --- a/.gitignore +++ b/.gitignore @@ -38,8 +38,8 @@ org.uqbar.project.wollok.lib/src/wollok/*.wlk settings.xml # Ignoring private & public keys -wollok-cli_rsa -wollok-cli_rsa.pub -wollok-site_rsa -wollok-site_rsa.pub +wollokcli_rsa +wollokcli_rsa.pub +wolloksite_rsa +wolloksite_rsa.pub diff --git a/scripts/wollokcli_rsa.enc b/scripts/wollokcli_rsa.enc new file mode 100644 index 0000000000000000000000000000000000000000..6a8f4f4daa839747179e426e6fde01de1c440a36 GIT binary patch literal 3408 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 literal 0 HcmV?d00001 From 7dbcdf2d89f16095a41b8f14bb113fdc0d587403 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 01:14:13 -0300 Subject: [PATCH 81/97] Test 12 --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0582f6227..6b3c1159d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,6 +25,9 @@ jobs: chmod 755 ~/.ssh openssl aes-256-cbc -pass pass:${{ secrets.WOLLOK_CLI_TOKEN }} -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key -d chmod 600 ~/.ssh/wollokcli_key + echo "888888" + cat ~/.ssh/wollokcli_key + echo "888888" cd ./scripts cp ./ssh_config ~/.ssh/config chmod 777 ./updateRestOfWollokRepos.sh From c09ad2d74c55045b4a18698c025c80a28dc6a733 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 01:19:32 -0300 Subject: [PATCH 82/97] Test 13 --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b3c1159d..19c2298fe 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -23,7 +23,7 @@ jobs: run: | mkdir ~/.ssh chmod 755 ~/.ssh - openssl aes-256-cbc -pass pass:${{ secrets.WOLLOK_CLI_TOKEN }} -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key -d + openssl aes-256-cbc -pass pass:iuhaser7832ruheris32 -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key -d chmod 600 ~/.ssh/wollokcli_key echo "888888" cat ~/.ssh/wollokcli_key From f4037ce1771c0d34298947f10f8e317fb6f93942 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 23:08:26 -0300 Subject: [PATCH 83/97] Using wollok-cli & wollok-site - test --- .github/workflows/build.yml | 27 ++++++------ scripts/updateRestOfWollokRepos.sh | 67 +++++++++++++++-------------- scripts/wollokcli_key.enc | Bin 2672 -> 3389 bytes scripts/wollokcli_rsa.enc | Bin 3408 -> 0 bytes scripts/wolloksite_key.enc | Bin 0 -> 3389 bytes settings.xml.enc | Bin 2224 -> 2224 bytes 6 files changed, 46 insertions(+), 48 deletions(-) delete mode 100644 scripts/wollokcli_rsa.enc create mode 100644 scripts/wolloksite_key.enc diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 19c2298fe..36f55b214 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,21 +19,6 @@ jobs: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - - name: Updating wollok-cli - run: | - mkdir ~/.ssh - chmod 755 ~/.ssh - openssl aes-256-cbc -pass pass:iuhaser7832ruheris32 -pbkdf2 -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key -d - chmod 600 ~/.ssh/wollokcli_key - echo "888888" - cat ~/.ssh/wollokcli_key - echo "888888" - cd ./scripts - cp ./ssh_config ~/.ssh/config - chmod 777 ./updateRestOfWollokRepos.sh - "./updateRestOfWollokRepos.sh" - cd .. - exit 1 - name: Run Maven Build run: | openssl aes-256-cbc -pass pass:${{ secrets.SETTINGS_GPG_TOKEN }} -pbkdf2 -in ./settings.xml.enc -out ./settings.xml -d @@ -55,6 +40,17 @@ jobs: --no-transfer-progress \ -P $PROFILES cd .. + - name: Updating wollok-cli & wollok-site + run: | + mkdir ~/.ssh + chmod 755 ~/.ssh + openssl aes-128-ctr -d -K {{ secrets.WOLLOK_CLI_KEY }} -iv {{ secrets.WOLLOK_CLI_IV }} -in wollokcli_key.enc -out ~/.ssh/wollokcli_key + openssl aes-128-ctr -d -K {{ secrets.WOLLOK_SITE_KEY }} -iv {{ secrets.WOLLOK_SITE_IV }} -in wolloksite_key.enc -out ~/.ssh/wolloksite_key + cd ./scripts + cp ./ssh_config ~/.ssh/config + chmod 777 ./updateRestOfWollokRepos.sh + "./updateRestOfWollokRepos.sh" + cd .. env: COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -64,6 +60,7 @@ jobs: CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} WOLLOK_CLI_TOKEN: ${{ secrets.WOLLOK_CLI_TOKEN }} + GITHUB_JOB: $GITHUB_JOB - name: Releasing Latest Development Version uses: "marvinpinto/action-automatic-releases@latest" with: diff --git a/scripts/updateRestOfWollokRepos.sh b/scripts/updateRestOfWollokRepos.sh index f931bf3bf..999d51d62 100755 --- a/scripts/updateRestOfWollokRepos.sh +++ b/scripts/updateRestOfWollokRepos.sh @@ -1,5 +1,3 @@ -# openssl aes-256-cbc -k "$travis_key_password" -d -md sha256 -a -in wolloksite_key.enc -out /tmp/wolloksite_key -# chmod 600 /tmp/wolloksite_key eval `ssh-agent -s` echo "Cloning wollok-cli repo..." @@ -13,55 +11,58 @@ echo "Copying Wollok library files into libs folder" mkdir -p ./libs cp ../org.uqbar.project.wollok.lib/src/wollok/*.wlk ./libs -# echo "****************************************************************************" -# echo "Cloning Wollok Site repo" -# git clone git@wollok_site:uqbar-project/wollok-site.git -# rm ./wollok-site/documentacion/wollokdoc/*.html -# rm ./wollok-site/documentacion/wollokDoc.md -# mkdir -p ./wollok-site/documentacion/wollokdoc +echo "****************************************************************************" +echo "Cloning Wollok Site repo" +git clone git@wollok_site:uqbar-project/wollok-site.git +rm ./wollok-site/documentacion/wollokdoc/*.html +rm ./wollok-site/documentacion/wollokDoc.md +mkdir -p ./wollok-site/documentacion/wollokdoc -# echo "Updating spanish WollokDoc files" -# java -cp "./wollok-cli/jars/*" org.uqbar.project.wollok.wollokDoc.WollokDocParser "./libs" -folder "./wollok-site/documentacion/wollokdoc" -locale "es" +echo "Updating spanish WollokDoc files" +java -cp "./wollok-cli/jars/*" org.uqbar.project.wollok.wollokDoc.WollokDocParser "./libs" -folder "./wollok-site/documentacion/wollokdoc" -locale "es" -# echo -# echo "List of files generated" -# ls ./wollok-site/documentacion/wollokdoc +echo +echo "List of files generated" +ls ./wollok-site/documentacion/wollokdoc # generamos la documentación en inglés # no copiamos el wollokDoc.md, si hay nuevos archivos o se elimina alguno hay que # ajustarlo manualmente -# echo "Updating english WollokDoc files" -# java -cp "./wollok-cli/jars/*" org.uqbar.project.wollok.wollokDoc.WollokDocParser "./libs" -folder "./wollok-site/en/documentation/wollokdoc" -locale "en" +echo "Updating english WollokDoc files" +java -cp "./wollok-cli/jars/*" org.uqbar.project.wollok.wollokDoc.WollokDocParser "./libs" -folder "./wollok-site/en/documentation/wollokdoc" -locale "en" -# echo -# echo "List of files generated" -# ls ./wollok-site/en/documentation/wollokdoc -# echo "****************************************************************************" +echo +echo "List of files generated" +ls ./wollok-site/en/documentation/wollokdoc +echo "****************************************************************************" echo "List of wollok-cli files updated" cd wollok-cli -echo $TRAVIS_JOB_ID > wollok-cli.lastUpdated +echo $GITHUB_JOB > wollok-cli.lastUpdated git status echo "" echo "============================================================================" echo "Pushing wollok-cli files" +BRANCH_ID=next-version-$GITHUB_JOB +git checkout -b $BRANCH_ID git add . git commit -m "Updating Wollok JARs library from Github Action => $GITHUB_JOB" -git push -v origin master +git push --set-upstream -v origin $BRANCH_ID echo "****************************************************************************" -# alias ssh='ssh -F <(cat .ssh/config /tmp/wolloksite_key)' -# cd ../wollok-site -# echo $TRAVIS_JOB_ID > wollok-site.lastUpdated -# echo "List of wollok-site files updated" -# git status -# echo "" -# echo "============================================================================" -# echo "Pushing wollok-site files" -# git add . -# git commit -m "Updating Wollokdoc files from Travis Job $TRAVIS_JOB_ID" -# git push -v origin master -# echo "****************************************************************************" +alias ssh='ssh -F <(cat .ssh/config ~/.ssh/wolloksite_key)' +cd ../wollok-site +echo $GITHUB_JOB > wollok-site.lastUpdated +echo "List of wollok-site files updated" +git status +echo "" +echo "============================================================================" +echo "Pushing wollok-site files" +git checkout -b $BRANCH_ID +git add . +git commit -m "Updating Wollokdoc files from Github Action $GITHUB_JOB" +git push --set-upstream -v origin $BRANCH_ID +echo "****************************************************************************" echo "...done" exit 0 \ No newline at end of file diff --git a/scripts/wollokcli_key.enc b/scripts/wollokcli_key.enc index ce94d4fe2e0c81faad4ac5783137b627672202b0..9dabf11ed30e06e0626905d15d0ac9b1274c8f76 100644 GIT binary patch literal 3389 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 T&?q^xM&kEnO1lCa0HAqygWtv|MJ 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 diff --git a/scripts/wollokcli_rsa.enc b/scripts/wollokcli_rsa.enc deleted file mode 100644 index 6a8f4f4daa839747179e426e6fde01de1c440a36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3408 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 diff --git a/scripts/wolloksite_key.enc b/scripts/wolloksite_key.enc new file mode 100644 index 0000000000000000000000000000000000000000..57b04d9c56051c2cf787a464aa21e70934f7b265 GIT binary patch literal 3389 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 TNLc%Rs3| literal 0 HcmV?d00001 diff --git a/settings.xml.enc b/settings.xml.enc index be1fd98e917256c9e67256ff21338f65c2e1602c..a255c446c1b608ee1b855540a622cc95efdf8898 100644 GIT binary patch literal 2224 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 literal 2224 zcmV;h2v7G@VQh3|WM5z5o?4Ogg%<-7xPf#IaLe~bf%$8ob0t@|4jHJcUpIJxnBjDm z7_LQ5>VK5c9iV^iimIv=x`J5huUi;FwYWkJb(Zo%opW^D87?!3*#lHxLP#!3v@|2+ z^duFD_Y?|4Cjg8?oY0kKXQaepMf&3Bx$wL5drx*P9nIScLry2}BrU$#W5yn9C($l5 zcVNYGhR&vKk(Ns0Iz1sBIi0Oe8_bE8C`gZm0@vy+mwlcZ3I78(JM6EWG3e4^A?h}W zw{s9yEO`E3kC+1}l!M*40WFl#SN}BZA9kNXk^R68hSO!6pKaFq`97&-wVm$$BtK#@ zooS8_5_QisJ{;TsoM{GXTd-E%D_^9GFCf>@%N8%U+(k6+Ht_~273%1?`Wbsb9jge@ z+7{y!O0IsP@wms7uaWYX-3#-$Cnf8YifHvzQt|amwqSiCA#fhvI@qBy0+7?Y$w@4anyyxnQ47l|z&v3C zv?KdoKzWq=?F2$HGfHT-3FhD;ldbCzO>7$6xWu1Fqh1v`gEXfi48OQ<2P4%J&3|6F zW0o0vqLEd9));;eyX3|Uqo;_iQLA5=9T>2R7#tcn0rYKN^R4LDJCEDM)U9I?WXwU0 zEXYryaqw6KIYC=K7}SKlk~T0KU6gWswg5_9 zu3Pq{1#>q^dNp{g;RUbN%tllEnvegjeu{6%E#leZjwWgyg4V-~qPadN8IXoW5h#wk zcLl=DWG>av;3ytZTnRx^_}H$Zd$=^s(!TnER8d<-0wePXbxqtm=MI|2ml_VmuEWG7 zVH@8R;wwqo!~blU1r}|1Iz`3|buIjf5=$pKFfyTe&RSZw=Qo*%I!*bwO*pHrca(;+o&-&KQ?K!M2i0&i`H?Ch(ff66(%2o$3kHnkA_0 zWpckDH;DX6C)(!3A4S_GP(6Hn03(%-s>37B{OUn7{`a(TJ_SW`z%Oye+j0GxNhS83 zEE14X%xoK-*1yDPEDb^QK|QwXxRN>l!I<}4CEHuRwoMTg&I(vaEEJcWH=6UO*7r-Y zf?=dN>R;g%9S#g6ShLYff#9}=qDhu=0b1SHNX1(=Ag1>@(4>vOtneXB)C;Q_7B(`7 z#}sGpkVZ`Ty2H#r;DZd)Ls<#Efv-0`a;9rp{)(Ol8$j`Hn|jXD5N)0u z6FNn~)Q2qHG>3ffCk@7|w=UfL^G99E>Zo~-`Lq-0j4~g28M3hIPZ@c-IKw7B7|8;q z^QgXONv>(-==Aw4vZ>!Qy&?Bknl2bHo~uY2bL!@d5{9x+97f4OXgg;Sbib~OR{!lQ zxQL^tZ2`#gV7#JQCJ~Q(gkLh_G-{3I(9Z(5s2L!o*VnV-`F6j9vChC(i-r};Ia;M= z#h|0U`0L!5-D9*H#2prpTdN|0rXvFD9R&% znoul-Kt+5Vf0(KYuP-wv*2WD|aFfAy!H<`-cD^z6G!xGU@rE}v>NYu_pSgZ_l zh1RvYF^j$z`ikmbXuvp?G$f0_Ug$irygCRCcWrpf8udE}C|;ious&(~GDOIOHUmA0 z>SwBsWzuq*$7;Bd0`N$!2Wo4MmoQs@Tk1S^?roP-P>A{t^MF98q!zmEO3H?99JatQN)C+h-` Date: Mon, 7 Jun 2021 23:17:46 -0300 Subject: [PATCH 84/97] Fix env variables for maven process --- .github/workflows/build.yml | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 36f55b214..645b8c648 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,6 +40,14 @@ jobs: --no-transfer-progress \ -P $PROFILES cd .. + env: + COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CI_NAME: github + BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }} + CI_BUILD_NUMBER: ${{ github.run_id }} + CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks + CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} - name: Updating wollok-cli & wollok-site run: | mkdir ~/.ssh @@ -52,14 +60,7 @@ jobs: "./updateRestOfWollokRepos.sh" cd .. env: - COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - CI_NAME: github - BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }} - CI_BUILD_NUMBER: ${{ github.run_id }} - CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks - CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} - WOLLOK_CLI_TOKEN: ${{ secrets.WOLLOK_CLI_TOKEN }} GITHUB_JOB: $GITHUB_JOB - name: Releasing Latest Development Version uses: "marvinpinto/action-automatic-releases@latest" From e3d4a269f23018ce9cf8fdceb5b48a21c5ce3a32 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 23:30:35 -0300 Subject: [PATCH 85/97] Separate 2 process for wollok-cli & wollok-site --- .github/workflows/build.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 645b8c648..04f8101ba 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,6 +19,18 @@ jobs: path: ~/.m2 key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 + - name: Decrypting keys + run: | + echo "Creating ssh" + mkdir ~/.ssh + chmod 755 ~/.ssh + echo "Decripting wollok-cli" + openssl aes-128-ctr -d -K {{ secrets.WOLLOK_CLI_KEY }} -iv {{ secrets.WOLLOK_CLI_IV }} -in wollokcli_key.enc -out ~/.ssh/wollokcli_key + echo "Decripting wollok-site" + openssl aes-128-ctr -d -K {{ secrets.WOLLOK_SITE_KEY }} -iv {{ secrets.WOLLOK_SITE_IV }} -in wolloksite_key.enc -out ~/.ssh/wolloksite_key + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_JOB: $GITHUB_JOB - name: Run Maven Build run: | openssl aes-256-cbc -pass pass:${{ secrets.SETTINGS_GPG_TOKEN }} -pbkdf2 -in ./settings.xml.enc -out ./settings.xml -d @@ -50,10 +62,6 @@ jobs: CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} - name: Updating wollok-cli & wollok-site run: | - mkdir ~/.ssh - chmod 755 ~/.ssh - openssl aes-128-ctr -d -K {{ secrets.WOLLOK_CLI_KEY }} -iv {{ secrets.WOLLOK_CLI_IV }} -in wollokcli_key.enc -out ~/.ssh/wollokcli_key - openssl aes-128-ctr -d -K {{ secrets.WOLLOK_SITE_KEY }} -iv {{ secrets.WOLLOK_SITE_IV }} -in wolloksite_key.enc -out ~/.ssh/wolloksite_key cd ./scripts cp ./ssh_config ~/.ssh/config chmod 777 ./updateRestOfWollokRepos.sh From ab9a70acc0733e11da135e92eba020fc0a4aa369 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 23:33:35 -0300 Subject: [PATCH 86/97] Fixing directory --- .github/workflows/build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04f8101ba..8eabe5c7c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,10 +24,10 @@ jobs: echo "Creating ssh" mkdir ~/.ssh chmod 755 ~/.ssh - echo "Decripting wollok-cli" - openssl aes-128-ctr -d -K {{ secrets.WOLLOK_CLI_KEY }} -iv {{ secrets.WOLLOK_CLI_IV }} -in wollokcli_key.enc -out ~/.ssh/wollokcli_key - echo "Decripting wollok-site" - openssl aes-128-ctr -d -K {{ secrets.WOLLOK_SITE_KEY }} -iv {{ secrets.WOLLOK_SITE_IV }} -in wolloksite_key.enc -out ~/.ssh/wolloksite_key + echo "Decrypting wollok-cli" + openssl aes-128-ctr -d -K {{ secrets.WOLLOK_CLI_KEY }} -iv {{ secrets.WOLLOK_CLI_IV }} -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key + echo "Decrypting wollok-site" + openssl aes-128-ctr -d -K {{ secrets.WOLLOK_SITE_KEY }} -iv {{ secrets.WOLLOK_SITE_IV }} -in ./scripts/wolloksite_key.enc -out ~/.ssh/wolloksite_key env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_JOB: $GITHUB_JOB From 10cd411f952be655bfa3182c63f72aa5936200e9 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 23:36:47 -0300 Subject: [PATCH 87/97] Fix typo in secrets --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8eabe5c7c..fdb716384 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -25,9 +25,9 @@ jobs: mkdir ~/.ssh chmod 755 ~/.ssh echo "Decrypting wollok-cli" - openssl aes-128-ctr -d -K {{ secrets.WOLLOK_CLI_KEY }} -iv {{ secrets.WOLLOK_CLI_IV }} -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key + openssl aes-128-ctr -d -K ${{ secrets.WOLLOK_CLI_KEY }} -iv ${{ secrets.WOLLOK_CLI_IV }} -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key echo "Decrypting wollok-site" - openssl aes-128-ctr -d -K {{ secrets.WOLLOK_SITE_KEY }} -iv {{ secrets.WOLLOK_SITE_IV }} -in ./scripts/wolloksite_key.enc -out ~/.ssh/wolloksite_key + openssl aes-128-ctr -d -K ${{ secrets.WOLLOK_SITE_KEY }} -iv ${{ secrets.WOLLOK_SITE_IV }} -in ./scripts/wolloksite_key.enc -out ~/.ssh/wolloksite_key env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_JOB: $GITHUB_JOB From e5a36fcee65d80d914806293bb7356844a6db084 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Mon, 7 Jun 2021 23:47:20 -0300 Subject: [PATCH 88/97] Changing permissions for private keys --- .github/workflows/build.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fdb716384..19eb73ecf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,7 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Decrypting keys + # if: {{ github.ref == 'ref/head/master' }} run: | echo "Creating ssh" mkdir ~/.ssh @@ -28,6 +29,7 @@ jobs: openssl aes-128-ctr -d -K ${{ secrets.WOLLOK_CLI_KEY }} -iv ${{ secrets.WOLLOK_CLI_IV }} -in ./scripts/wollokcli_key.enc -out ~/.ssh/wollokcli_key echo "Decrypting wollok-site" openssl aes-128-ctr -d -K ${{ secrets.WOLLOK_SITE_KEY }} -iv ${{ secrets.WOLLOK_SITE_IV }} -in ./scripts/wolloksite_key.enc -out ~/.ssh/wolloksite_key + chmod 600 ~/.ssh/wollokcli_key ~/.ssh/wolloksite_key env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_JOB: $GITHUB_JOB @@ -61,6 +63,7 @@ jobs: CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} - name: Updating wollok-cli & wollok-site + # if: {{ github.ref == 'ref/head/master' }} run: | cd ./scripts cp ./ssh_config ~/.ssh/config From 322d58f7ccf8cc6accab4bf66afe7b271d05b7f6 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 8 Jun 2021 00:02:42 -0300 Subject: [PATCH 89/97] Using github config --- scripts/updateRestOfWollokRepos.sh | 46 ++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/scripts/updateRestOfWollokRepos.sh b/scripts/updateRestOfWollokRepos.sh index 999d51d62..1349992a3 100755 --- a/scripts/updateRestOfWollokRepos.sh +++ b/scripts/updateRestOfWollokRepos.sh @@ -1,7 +1,16 @@ eval `ssh-agent -s` +# ************************************************************************************** +# WOLLOK-CLI +# ************************************************************************************** +echo "****************************************************************************" +echo "Setting github user configuration for wollok-cli" +git config --global user.email "wollokcli@gmail.com" +git config --global user.name "Wollok CLI Bot" + echo "Cloning wollok-cli repo..." git clone git@wollok_cli:uqbar-project/wollok-cli.git + echo "Updating jars to wollok-cli" cd ./wollok-cli ./generateCI.sh ../.. @@ -11,7 +20,28 @@ echo "Copying Wollok library files into libs folder" mkdir -p ./libs cp ../org.uqbar.project.wollok.lib/src/wollok/*.wlk ./libs +echo "List of wollok-cli files updated" +cd wollok-cli +echo $GITHUB_JOB > wollok-cli.lastUpdated +git status +echo "" +echo "============================================================================" +echo "Pushing wollok-cli files" +BRANCH_ID=next-version-$GITHUB_JOB +git checkout -b $BRANCH_ID +git add . +git commit -m "Updating Wollok JARs library from Github Action => $GITHUB_JOB" +git push --set-upstream -v origin $BRANCH_ID + +# ************************************************************************************** +# WOLLOK-SITE +# ************************************************************************************** + echo "****************************************************************************" +echo "Setting github user configuration for wollok-site" +git config --global user.email "wolloksite@gmail.com" +git config --global user.name "Wollok Site Bot" + echo "Cloning Wollok Site repo" git clone git@wollok_site:uqbar-project/wollok-site.git rm ./wollok-site/documentacion/wollokdoc/*.html @@ -34,21 +64,7 @@ java -cp "./wollok-cli/jars/*" org.uqbar.project.wollok.wollokDoc.WollokDocParse echo echo "List of files generated" ls ./wollok-site/en/documentation/wollokdoc -echo "****************************************************************************" - -echo "List of wollok-cli files updated" -cd wollok-cli -echo $GITHUB_JOB > wollok-cli.lastUpdated -git status -echo "" -echo "============================================================================" -echo "Pushing wollok-cli files" -BRANCH_ID=next-version-$GITHUB_JOB -git checkout -b $BRANCH_ID -git add . -git commit -m "Updating Wollok JARs library from Github Action => $GITHUB_JOB" -git push --set-upstream -v origin $BRANCH_ID -echo "****************************************************************************" +echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" alias ssh='ssh -F <(cat .ssh/config ~/.ssh/wolloksite_key)' cd ../wollok-site From 4fdc744d6e76ef504ab2574b925a1debc59740b7 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 8 Jun 2021 00:15:53 -0300 Subject: [PATCH 90/97] Fix directories & use github action id --- .github/workflows/build.yml | 3 ++- scripts/updateRestOfWollokRepos.sh | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 19eb73ecf..e2924039e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -72,8 +72,9 @@ jobs: cd .. env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - GITHUB_JOB: $GITHUB_JOB + GITHUB_RUN_ID: $GITHUB_RUN_ID - name: Releasing Latest Development Version + if: {{ github.ref == 'ref/head/dev' }} uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/scripts/updateRestOfWollokRepos.sh b/scripts/updateRestOfWollokRepos.sh index 1349992a3..f876fb8b9 100755 --- a/scripts/updateRestOfWollokRepos.sh +++ b/scripts/updateRestOfWollokRepos.sh @@ -22,16 +22,17 @@ cp ../org.uqbar.project.wollok.lib/src/wollok/*.wlk ./libs echo "List of wollok-cli files updated" cd wollok-cli -echo $GITHUB_JOB > wollok-cli.lastUpdated +echo $GITHUB_RUN_ID > wollok-cli.lastUpdated git status echo "" echo "============================================================================" echo "Pushing wollok-cli files" -BRANCH_ID=next-version-$GITHUB_JOB +BRANCH_ID=next-version-$GITHUB_RUN_ID git checkout -b $BRANCH_ID git add . -git commit -m "Updating Wollok JARs library from Github Action => $GITHUB_JOB" +git commit -m "Updating Wollok JARs library from Github Action => $GITHUB_RUN_ID" git push --set-upstream -v origin $BRANCH_ID +cd .. # ************************************************************************************** # WOLLOK-SITE @@ -67,8 +68,8 @@ ls ./wollok-site/en/documentation/wollokdoc echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>" alias ssh='ssh -F <(cat .ssh/config ~/.ssh/wolloksite_key)' -cd ../wollok-site -echo $GITHUB_JOB > wollok-site.lastUpdated +cd ./wollok-site +echo $GITHUB_RUN_ID > wollok-site.lastUpdated echo "List of wollok-site files updated" git status echo "" @@ -76,8 +77,9 @@ echo "========================================================================== echo "Pushing wollok-site files" git checkout -b $BRANCH_ID git add . -git commit -m "Updating Wollokdoc files from Github Action $GITHUB_JOB" +git commit -m "Updating Wollokdoc files from Github Action $GITHUB_RUN_ID" git push --set-upstream -v origin $BRANCH_ID +cd .. echo "****************************************************************************" echo "...done" From 13cdc73acf03f7e6123284eddc1c312264de7e89 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 8 Jun 2021 00:20:52 -0300 Subject: [PATCH 91/97] Forcing new build --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e2924039e..00c21cd9e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,7 +74,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_RUN_ID: $GITHUB_RUN_ID - name: Releasing Latest Development Version - if: {{ github.ref == 'ref/head/dev' }} + # if: {{ github.ref == 'ref/head/dev' }} uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" From 393183d82e25662fa25d4968f55efa33d9d9ea9a Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 8 Jun 2021 00:31:17 -0300 Subject: [PATCH 92/97] Adding wollok-cli & wollok-site update only for releasing --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00c21cd9e..7caf53d67 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Decrypting keys - # if: {{ github.ref == 'ref/head/master' }} + if: {{ github.ref == 'ref/head/master' }} run: | echo "Creating ssh" mkdir ~/.ssh @@ -63,7 +63,7 @@ jobs: CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} - name: Updating wollok-cli & wollok-site - # if: {{ github.ref == 'ref/head/master' }} + if: {{ github.ref == 'ref/head/master' }} run: | cd ./scripts cp ./ssh_config ~/.ssh/config From 87295193c92ee1f53e42a22944d2a110001e351b Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 8 Jun 2021 00:32:14 -0300 Subject: [PATCH 93/97] If does not work well, back to previous idea --- .github/workflows/build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7caf53d67..00c21cd9e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Decrypting keys - if: {{ github.ref == 'ref/head/master' }} + # if: {{ github.ref == 'ref/head/master' }} run: | echo "Creating ssh" mkdir ~/.ssh @@ -63,7 +63,7 @@ jobs: CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} - name: Updating wollok-cli & wollok-site - if: {{ github.ref == 'ref/head/master' }} + # if: {{ github.ref == 'ref/head/master' }} run: | cd ./scripts cp ./ssh_config ~/.ssh/config From 6d06b63915b53346b85c0037656c721115f0b0da Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 8 Jun 2021 18:40:05 -0300 Subject: [PATCH 94/97] Creating PRs programmatically for wollok-cli & wollok-site --- scripts/updateRestOfWollokRepos.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/scripts/updateRestOfWollokRepos.sh b/scripts/updateRestOfWollokRepos.sh index f876fb8b9..e823044d1 100755 --- a/scripts/updateRestOfWollokRepos.sh +++ b/scripts/updateRestOfWollokRepos.sh @@ -32,6 +32,7 @@ git checkout -b $BRANCH_ID git add . git commit -m "Updating Wollok JARs library from Github Action => $GITHUB_RUN_ID" git push --set-upstream -v origin $BRANCH_ID +gh pr create --base master --title "New Wollok Version" --body "Updating Wollok Version - Github Action $GITHUB_RUN_ID" cd .. # ************************************************************************************** @@ -79,6 +80,7 @@ git checkout -b $BRANCH_ID git add . git commit -m "Updating Wollokdoc files from Github Action $GITHUB_RUN_ID" git push --set-upstream -v origin $BRANCH_ID +gh pr create --base master --title "New Wollok Version" --body "Updating Wollok Version - Github Action $GITHUB_RUN_ID" cd .. echo "****************************************************************************" From e9bc30f7a917f5c6e716deb572e9c3b920e9396e Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 8 Jun 2021 19:28:18 -0300 Subject: [PATCH 95/97] Using git rquest-pull --- scripts/updateRestOfWollokRepos.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/updateRestOfWollokRepos.sh b/scripts/updateRestOfWollokRepos.sh index e823044d1..b4ca7cc12 100755 --- a/scripts/updateRestOfWollokRepos.sh +++ b/scripts/updateRestOfWollokRepos.sh @@ -32,7 +32,7 @@ git checkout -b $BRANCH_ID git add . git commit -m "Updating Wollok JARs library from Github Action => $GITHUB_RUN_ID" git push --set-upstream -v origin $BRANCH_ID -gh pr create --base master --title "New Wollok Version" --body "Updating Wollok Version - Github Action $GITHUB_RUN_ID" +git request-pull "Updating Wollok Version - Github Action $GITHUB_RUN_ID" origin/master $BRANCH_ID cd .. # ************************************************************************************** @@ -80,7 +80,7 @@ git checkout -b $BRANCH_ID git add . git commit -m "Updating Wollokdoc files from Github Action $GITHUB_RUN_ID" git push --set-upstream -v origin $BRANCH_ID -gh pr create --base master --title "New Wollok Version" --body "Updating Wollok Version - Github Action $GITHUB_RUN_ID" +git request-pull "Updating Wollok Version - Github Action $GITHUB_RUN_ID" origin/master $BRANCH_ID cd .. echo "****************************************************************************" From 7898c7d4961ba0473d0bb01a131f0e03be966e50 Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 8 Jun 2021 23:22:44 -0300 Subject: [PATCH 96/97] testing if --- .github/workflows/build.yml | 4 ++-- scripts/updateRestOfWollokRepos.sh | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 00c21cd9e..803f82398 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -63,7 +63,7 @@ jobs: CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} - name: Updating wollok-cli & wollok-site - # if: {{ github.ref == 'ref/head/master' }} + if: github.ref == 'ref/head/master' run: | cd ./scripts cp ./ssh_config ~/.ssh/config @@ -74,7 +74,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_RUN_ID: $GITHUB_RUN_ID - name: Releasing Latest Development Version - # if: {{ github.ref == 'ref/head/dev' }} + if: github.ref == 'ref/head/dev' uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/scripts/updateRestOfWollokRepos.sh b/scripts/updateRestOfWollokRepos.sh index b4ca7cc12..78bb9203a 100755 --- a/scripts/updateRestOfWollokRepos.sh +++ b/scripts/updateRestOfWollokRepos.sh @@ -32,7 +32,9 @@ git checkout -b $BRANCH_ID git add . git commit -m "Updating Wollok JARs library from Github Action => $GITHUB_RUN_ID" git push --set-upstream -v origin $BRANCH_ID -git request-pull "Updating Wollok Version - Github Action $GITHUB_RUN_ID" origin/master $BRANCH_ID +gh auth login --hostname wollok_cli +# por el momento no podemos crear PRs porque `gh` no soporta conexión vía SSH +# gh pr create --base master --title "New Wollok Version" --body "Updating Wollok Version - Github Action $GITHUB_RUN_ID" cd .. # ************************************************************************************** @@ -80,7 +82,9 @@ git checkout -b $BRANCH_ID git add . git commit -m "Updating Wollokdoc files from Github Action $GITHUB_RUN_ID" git push --set-upstream -v origin $BRANCH_ID -git request-pull "Updating Wollok Version - Github Action $GITHUB_RUN_ID" origin/master $BRANCH_ID + +# por el momento no podemos crear PRs porque `gh` no soporta conexión vía SSH +# gh pr create --base master --title "New Wollok Version" --body "Updating Wollok Version - Github Action $GITHUB_RUN_ID" cd .. echo "****************************************************************************" From e8d9f59be4df8dc9fc9541b4788cd9e66f43443d Mon Sep 17 00:00:00 2001 From: Fernando Dodino Date: Tue, 8 Jun 2021 23:46:09 -0300 Subject: [PATCH 97/97] Fixing conditional actions --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 803f82398..9f681410d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,7 +20,7 @@ jobs: key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }} restore-keys: ${{ runner.os }}-m2 - name: Decrypting keys - # if: {{ github.ref == 'ref/head/master' }} + if: github.ref == 'refs/heads/master' run: | echo "Creating ssh" mkdir ~/.ssh @@ -63,7 +63,7 @@ jobs: CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }} - name: Updating wollok-cli & wollok-site - if: github.ref == 'ref/head/master' + if: github.ref == 'refs/heads/master' run: | cd ./scripts cp ./ssh_config ~/.ssh/config @@ -74,7 +74,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_RUN_ID: $GITHUB_RUN_ID - name: Releasing Latest Development Version - if: github.ref == 'ref/head/dev' + if: github.ref == 'refs/heads/dev' uses: "marvinpinto/action-automatic-releases@latest" with: repo_token: "${{ secrets.GITHUB_TOKEN }}"