From 6f517e422019f856236a78149625e2ef5dab02a0 Mon Sep 17 00:00:00 2001 From: Aleksandr Mishin Date: Wed, 16 Nov 2022 17:48:50 +0300 Subject: [PATCH 01/12] #227: rultor modification --- .rultor.yml | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/.rultor.yml b/.rultor.yml index 514d7b89..1d090e02 100644 --- a/.rultor.yml +++ b/.rultor.yml @@ -1,6 +1,5 @@ docker: - image: "iammaxim/j2eo:latest" - as_root: true + image: "yegor256/rultor-image:1.9.1" architect: - yegor256 assets: @@ -9,17 +8,30 @@ assets: secring.gpg: yegor256/polystat-secrets#secring.gpg docker-password: yegor256/polystat-secrets#docker-password install: | - cp ../gradle.properties . - wget https://www.antlr.org/download/antlr-4.9.2-complete.jar + pdd --file=/dev/null merge: script: | - gradle build --info + mvn clean install --errors -Dstyle.color=never release: script: |- [[ "${tag}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || exit -1 - gradle build fatJar publish -x test --info -Dcandidates=false -PmvnPublicationVersion=${tag} -Dsigning.secretKeyRingFile=/home/r/secring.gpg - mv "J2EO-${tag}.jar" j2eo.jar - image=yegor256/j2eo - sudo docker build "$(pwd)" --tag "${image}:${tag}" - cat ../docker-password | sudo docker login --password-stdin --username yegor256 - sudo docker push "${image}:${tag}" \ No newline at end of file + mvn versions:set "-DnewVersion=${tag}" -Dstyle.color=never + git commit -am "${tag}" + mvn clean install -Dinvoker.skip + mvn clean deploy -Ppolystat -Psonatype --errors --settings ../settings.xml -Dstyle.color=never + mkdir /tmp/polystat + cp -R src/main/eo /tmp/polystat/objects + cp -R src/test/eo /tmp/polystat/tests + branch=$(git rev-parse --abbrev-ref HEAD) + git checkout gh-pages + git reset --hard + sudo git config --global --add safe.directory "$(pwd)" + sudo /bin/bash -c "cd '$(pwd)'; git clean -fd" + rm -rf polystat + cp -R /tmp/polystat . + find polystat -name '*.eo' | xargs sed -i "s/0\.0\.0/${tag}/g" + git add polystat + find polystat -name '*.eo' > polystat.lst + git add polystat.lst + git commit -am "polystat ${tag}" + git checkout "${branch}" From a3fa31a3bd1a503f2b765ebd743a5ce81c42b0bd Mon Sep 17 00:00:00 2001 From: Aleksandr Mishin Date: Wed, 16 Nov 2022 17:53:01 +0300 Subject: [PATCH 02/12] empty line --- .rultor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.rultor.yml b/.rultor.yml index 1d090e02..3e291157 100644 --- a/.rultor.yml +++ b/.rultor.yml @@ -35,3 +35,4 @@ release: git add polystat.lst git commit -am "polystat ${tag}" git checkout "${branch}" + From 550ebbed9b8515f9cee894a070642190d60c6c63 Mon Sep 17 00:00:00 2001 From: Aleksandr Mishin Date: Wed, 16 Nov 2022 17:53:14 +0300 Subject: [PATCH 03/12] empty line --- .rultor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.rultor.yml b/.rultor.yml index 3e291157..1d090e02 100644 --- a/.rultor.yml +++ b/.rultor.yml @@ -35,4 +35,3 @@ release: git add polystat.lst git commit -am "polystat ${tag}" git checkout "${branch}" - From 4cf1baded5d78b45b9746470a5ed99178594bdea Mon Sep 17 00:00:00 2001 From: Aleksandr Mishin Date: Wed, 16 Nov 2022 18:45:45 +0300 Subject: [PATCH 04/12] slight modification --- .rultor.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.rultor.yml b/.rultor.yml index 1d090e02..1cdc68d9 100644 --- a/.rultor.yml +++ b/.rultor.yml @@ -15,6 +15,10 @@ merge: release: script: |- [[ "${tag}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || exit -1 + image=yegor256/j2eo + sudo docker build "$(pwd)" --tag "${image}:${tag}" + cat ../docker-password | sudo docker login --password-stdin --username yegor256 + sudo docker push "${image}:${tag}" mvn versions:set "-DnewVersion=${tag}" -Dstyle.color=never git commit -am "${tag}" mvn clean install -Dinvoker.skip From e3180aec3fb61e685fdfc88e0ccbe1f1493bdfc5 Mon Sep 17 00:00:00 2001 From: Aleksandr Mishin Date: Thu, 17 Nov 2022 16:32:52 +0300 Subject: [PATCH 05/12] changed docker place in .rultor.yml --- .rultor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.rultor.yml b/.rultor.yml index 1cdc68d9..da40bd4d 100644 --- a/.rultor.yml +++ b/.rultor.yml @@ -15,10 +15,6 @@ merge: release: script: |- [[ "${tag}" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]] || exit -1 - image=yegor256/j2eo - sudo docker build "$(pwd)" --tag "${image}:${tag}" - cat ../docker-password | sudo docker login --password-stdin --username yegor256 - sudo docker push "${image}:${tag}" mvn versions:set "-DnewVersion=${tag}" -Dstyle.color=never git commit -am "${tag}" mvn clean install -Dinvoker.skip @@ -39,3 +35,7 @@ release: git add polystat.lst git commit -am "polystat ${tag}" git checkout "${branch}" + image=yegor256/j2eo + sudo docker build "$(pwd)" --tag "${image}:${tag}" + cat ../docker-password | sudo docker login --password-stdin --username yegor256 + sudo docker push "${image}:${tag}" From 13f2ac0ff06b3dce4bbc247019d2f4ceb5f46c45 Mon Sep 17 00:00:00 2001 From: Aleksandr Mishin Date: Thu, 24 Nov 2022 18:27:45 +0300 Subject: [PATCH 06/12] empty line --- .rultor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.rultor.yml b/.rultor.yml index da40bd4d..a13fbe23 100644 --- a/.rultor.yml +++ b/.rultor.yml @@ -39,3 +39,4 @@ release: sudo docker build "$(pwd)" --tag "${image}:${tag}" cat ../docker-password | sudo docker login --password-stdin --username yegor256 sudo docker push "${image}:${tag}" + From 04810ddfb902efd5c93517e59f08001b8ac232db Mon Sep 17 00:00:00 2001 From: Aleksandr Mishin Date: Thu, 24 Nov 2022 18:27:59 +0300 Subject: [PATCH 07/12] empty line --- .rultor.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.rultor.yml b/.rultor.yml index a13fbe23..da40bd4d 100644 --- a/.rultor.yml +++ b/.rultor.yml @@ -39,4 +39,3 @@ release: sudo docker build "$(pwd)" --tag "${image}:${tag}" cat ../docker-password | sudo docker login --password-stdin --username yegor256 sudo docker push "${image}:${tag}" - From ddca58ff1a9d214e80f1db0daa0d653e6080184b Mon Sep 17 00:00:00 2001 From: Aleksandr Mishin Date: Tue, 29 Nov 2022 23:46:04 +0300 Subject: [PATCH 08/12] version changing --- .github/workflows/gradle-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index e1e09d60..d0dc46cc 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -21,7 +21,7 @@ jobs: - uses: actions/setup-java@v3 with: - java-version: 11 + java-version: '11' - uses: suisei-cn/actions-download-file@v1.3.0 name: Download ANTLR @@ -53,7 +53,7 @@ jobs: - uses: actions/setup-java@v3 with: - java-version: 11 + java-version: '11' - run: | wget https://www.antlr.org/download/antlr-4.9.2-complete.jar From 71f932147779ebe3a953ec5fc4e7c80c41ed1a69 Mon Sep 17 00:00:00 2001 From: Aleksandr Mishin Date: Tue, 29 Nov 2022 23:50:10 +0300 Subject: [PATCH 09/12] modified version --- .github/workflows/gradle-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index d0dc46cc..b41440b9 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v2 with: java-version: '11' @@ -51,7 +51,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 + - uses: actions/setup-java@v2 with: java-version: '11' From c8b8a47fc0622d61349ec6ebce2d2478ab7f2b08 Mon Sep 17 00:00:00 2001 From: Aleksandr Mishin Date: Tue, 29 Nov 2022 23:51:36 +0300 Subject: [PATCH 10/12] switching back --- .github/workflows/gradle-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index b41440b9..d0dc46cc 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -19,7 +19,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: java-version: '11' @@ -51,7 +51,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-java@v2 + - uses: actions/setup-java@v3 with: java-version: '11' From 27f40389abbe208beb6b50a002a004a6e03b9e80 Mon Sep 17 00:00:00 2001 From: Aleksandr Mishin Date: Tue, 29 Nov 2022 23:55:22 +0300 Subject: [PATCH 11/12] distribution --- .github/workflows/gradle-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index d0dc46cc..792650b5 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -53,6 +53,7 @@ jobs: - uses: actions/setup-java@v3 with: + distribution: 'temurin' java-version: '11' - run: | From 7447e8cdec0d92c41f5657d60114ae2701d23653 Mon Sep 17 00:00:00 2001 From: Aleksandr Mishin Date: Tue, 29 Nov 2022 23:58:26 +0300 Subject: [PATCH 12/12] distribution --- .github/workflows/gradle-build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gradle-build.yml b/.github/workflows/gradle-build.yml index 792650b5..2a69cd2d 100644 --- a/.github/workflows/gradle-build.yml +++ b/.github/workflows/gradle-build.yml @@ -21,6 +21,7 @@ jobs: - uses: actions/setup-java@v3 with: + distribution: 'temurin' java-version: '11' - uses: suisei-cn/actions-download-file@v1.3.0