From ee3a056c9387392e42b94cdeca6e4b3d616e0e1c Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 21:50:19 +0100 Subject: [PATCH 01/10] .... --- .gitea/workflows/develop -> build.yml | 5 +++++ .gitea/workflows/pr-closed.yml | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index 0289f02..855b16f 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -20,6 +20,11 @@ jobs: curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output ../tea chmod +x ../tea ../tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }} + - name: tag + run: | + ../tea r ls -o=simple + echo $(../tea r ls -o=simple | head -n 1) + - uses: http://sigyl.com:3000/actions/setup-node@v3 with: node-version: '20' diff --git a/.gitea/workflows/pr-closed.yml b/.gitea/workflows/pr-closed.yml index 7decd0e..a79eb1f 100644 --- a/.gitea/workflows/pr-closed.yml +++ b/.gitea/workflows/pr-closed.yml @@ -23,8 +23,6 @@ jobs: token: ${{ secrets.BOT_TOKEN }} - name: tag run: | - git fetch --tags - git tag -l ../tea r ls -o=simple - name: delete develop branch id: delete_develop_branch From 891dae3a059aba90b6063d1a17e4fe3c64e2336a Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 21:52:11 +0100 Subject: [PATCH 02/10] .... --- .gitea/workflows/develop -> build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index 855b16f..ce5eeb7 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -21,9 +21,10 @@ jobs: chmod +x ../tea ../tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }} - name: tag + - name: get tag run: | ../tea r ls -o=simple - echo $(../tea r ls -o=simple | head -n 1) + echo $(../tea r ls -o=simple | head -n 1 | tr " " "\n" | head -n 1) - uses: http://sigyl.com:3000/actions/setup-node@v3 with: From 8dcc8b14eb9c7c6e70d6e120cfd9d14316f6dbcf Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 21:52:49 +0100 Subject: [PATCH 03/10] .... --- .gitea/workflows/develop -> build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index ce5eeb7..350c114 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -20,7 +20,6 @@ jobs: curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output ../tea chmod +x ../tea ../tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }} - - name: tag - name: get tag run: | ../tea r ls -o=simple From a11bb384279c01b38e03e997ea89fe110a53ec1b Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 22:01:37 +0100 Subject: [PATCH 04/10] .... --- .gitea/workflows/develop -> build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index 350c114..741e90b 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -23,8 +23,8 @@ jobs: - name: get tag run: | ../tea r ls -o=simple - echo $(../tea r ls -o=simple | head -n 1 | tr " " "\n" | head -n 1) - + version=[[ $(../tea r ls -o=simple | head -n 1 | tr " " "\n" | head -n 1) ]] + echo version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=. - uses: http://sigyl.com:3000/actions/setup-node@v3 with: node-version: '20' From ae701843b6d6a2dcf9627c20d56d574d3e41e75c Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 22:02:58 +0100 Subject: [PATCH 05/10] .... --- .gitea/workflows/develop -> build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index 741e90b..3bda431 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -23,7 +23,7 @@ jobs: - name: get tag run: | ../tea r ls -o=simple - version=[[ $(../tea r ls -o=simple | head -n 1 | tr " " "\n" | head -n 1) ]] + version="$(../tea r ls -o=simple | head -n 1 | tr " " "\n" | head -n 1)"" echo version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=. - uses: http://sigyl.com:3000/actions/setup-node@v3 with: From 33f938d90ef1694087a5d46b8fff42bf34d4d00b Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 22:03:30 +0100 Subject: [PATCH 06/10] .... --- .gitea/workflows/develop -> build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index 3bda431..a3b070c 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -23,7 +23,7 @@ jobs: - name: get tag run: | ../tea r ls -o=simple - version="$(../tea r ls -o=simple | head -n 1 | tr " " "\n" | head -n 1)"" + version="$(../tea r ls -o=simple | head -n 1 | tr " " "\n" | head -n 1)" echo version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=. - uses: http://sigyl.com:3000/actions/setup-node@v3 with: From 900de76e9730eb506cfff42d558b36ae4040f84e Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 22:04:33 +0100 Subject: [PATCH 07/10] .... --- .gitea/workflows/develop -> build.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index a3b070c..ff0e750 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -23,8 +23,9 @@ jobs: - name: get tag run: | ../tea r ls -o=simple - version="$(../tea r ls -o=simple | head -n 1 | tr " " "\n" | head -n 1)" - echo version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=. + export version="$(../tea r ls -o=simple | head -n 1 | tr " " "\n" | head -n 1)" + echo $version + echo $version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=. - uses: http://sigyl.com:3000/actions/setup-node@v3 with: node-version: '20' From 2fca33f8d580b7a14777afca671d65a545b0aa67 Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 22:11:07 +0100 Subject: [PATCH 08/10] .... --- .gitea/workflows/develop -> build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index ff0e750..e0c4d85 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -23,9 +23,9 @@ jobs: - name: get tag run: | ../tea r ls -o=simple - export version="$(../tea r ls -o=simple | head -n 1 | tr " " "\n" | head -n 1)" + version="$(../tea r ls -o=simple | head -n 1 | tr " " "\n" | head -n 1)" echo $version - echo $version | awk -F. '/[0-9]+\./{$NF++;print}' OFS=. + echo $version | awk -F. '{$NF = $NF + 1;} 1' | sed 's/ /./g' - uses: http://sigyl.com:3000/actions/setup-node@v3 with: node-version: '20' From 3eea22ad506cefbcc9288e05e251ddb458ee939e Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 22:16:31 +0100 Subject: [PATCH 09/10] .... --- .gitea/workflows/develop -> build.yml | 6 ------ .gitea/workflows/pr-closed.yml | 5 ++++- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index e0c4d85..0289f02 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -20,12 +20,6 @@ jobs: curl https://dl.gitea.com/tea/0.9.2/tea-0.9.2-linux-386 --output ../tea chmod +x ../tea ../tea login add -n=this --url=${{ github.server_url}} -t=${{ secrets.BOT_TOKEN }} - - name: get tag - run: | - ../tea r ls -o=simple - version="$(../tea r ls -o=simple | head -n 1 | tr " " "\n" | head -n 1)" - echo $version - echo $version | awk -F. '{$NF = $NF + 1;} 1' | sed 's/ /./g' - uses: http://sigyl.com:3000/actions/setup-node@v3 with: node-version: '20' diff --git a/.gitea/workflows/pr-closed.yml b/.gitea/workflows/pr-closed.yml index a79eb1f..bce2525 100644 --- a/.gitea/workflows/pr-closed.yml +++ b/.gitea/workflows/pr-closed.yml @@ -21,9 +21,12 @@ jobs: - uses: http://sigyl.com:3000/actions/checkout@v3.5.4 with: token: ${{ secrets.BOT_TOKEN }} - - name: tag + - name: get tag run: | ../tea r ls -o=simple + version="$(../tea r ls -o=simple | head -n 1 | tr " " "\n" | head -n 1)" + version=$version | awk -F. '{$NF = $NF + 1;} 1' | sed 's/ /./g' + ../tea r c --note="this isrelease ${version}" --tag=${version} --title=${version} --target=${{ github.sha }} - name: delete develop branch id: delete_develop_branch run: git push origin --delete ${{ github.head_ref }} From 78a828bf5aed45a533e7634eee82fbc760989f7e Mon Sep 17 00:00:00 2001 From: gilesb Date: Mon, 23 Oct 2023 22:19:18 +0100 Subject: [PATCH 10/10] .... --- .gitea/workflows/develop -> build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index 0289f02..6df3931 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -72,7 +72,7 @@ jobs: - name: make PR run: | ../tea pr ls -f=base,head -o=csv - if [[ $(./tea pr ls -f=base,head -o=csv | grep "\"master\",\"${{ github.ref_name }}\"" | head -c1 | wc -c) -eq 0 ]]; then + if [[ $(../tea pr ls -f=base,head -o=csv | grep "\"master\",\"${{ github.ref_name }}\"" | head -c1 | wc -c) -eq 0 ]]; then ../tea pr c --base=master --head=${{ github.ref_name }} --description=" development pull request this PR is will been built on [${{ github.ref_name }}](${{ github.serverUrl }}/${{ github.repository }}/src/branch/${{ env.BUILD_BRANCH }})