From 1309d6c3fbd5e06a8fcb162e2e323825c5125a2d Mon Sep 17 00:00:00 2001 From: giles Date: Mon, 23 Oct 2023 02:07:34 +0100 Subject: [PATCH] ................ --- .gitea/workflows/build->develop.yml | 2 +- .gitea/workflows/convert-built-to-yml.yml | 4 ++-- .gitea/workflows/develop -> build.yml | 2 +- .gitea/workflows/format->develop.yml | 3 --- .gitea/workflows/pr-closed.yml | 2 +- .gitea/workflows/pr-reopened.yml | 2 +- 6 files changed, 6 insertions(+), 9 deletions(-) diff --git a/.gitea/workflows/build->develop.yml b/.gitea/workflows/build->develop.yml index 5229a96..7e2622c 100644 --- a/.gitea/workflows/build->develop.yml +++ b/.gitea/workflows/build->develop.yml @@ -27,7 +27,7 @@ jobs: run: | firstString=${{ github.ref_name }} secondString="develop" - echo ::set-env name=DEVELOPMENT_BRANCH::${firststring/format\//"$secondstring"\/} + echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build\//"$secondString"\/} - name: GIT commit and push all changed files env: CI_COMMIT_MESSAGE: converted to yml for review. diff --git a/.gitea/workflows/convert-built-to-yml.yml b/.gitea/workflows/convert-built-to-yml.yml index 4d290d6..fb36789 100644 --- a/.gitea/workflows/convert-built-to-yml.yml +++ b/.gitea/workflows/convert-built-to-yml.yml @@ -3,7 +3,7 @@ run-name: ${{ github.actor }} is learning GitHub Actions on: push: branches: - - 'build-**' + - 'build/**' jobs: develop-branch: runs-on: ubuntu-latest @@ -19,7 +19,7 @@ jobs: run: | firstString=${{ github.ref_name }} secondString="develop" - echo ::set-env name=DEVELOPMENT_BRANCH::${firststring/format\//"$secondstring"\/} + echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/build\//"$secondString"\/} - name: GIT push env: CI_COMMIT_MESSAGE: converted to yml for review. diff --git a/.gitea/workflows/develop -> build.yml b/.gitea/workflows/develop -> build.yml index 836c48e..ac2097a 100644 --- a/.gitea/workflows/develop -> build.yml +++ b/.gitea/workflows/develop -> build.yml @@ -34,7 +34,7 @@ jobs: run: | firstString=${{ github.ref_name }} secondString="build" - echo ::set-env name=BUILD_BRANCH::${firststring/format\//"$secondstring"\/} + echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/} - name: GIT commit and push all changed files env: CI_COMMIT_MESSAGE: Development branch built to xml. diff --git a/.gitea/workflows/format->develop.yml b/.gitea/workflows/format->develop.yml index fee3fa2..e874e0e 100644 --- a/.gitea/workflows/format->develop.yml +++ b/.gitea/workflows/format->develop.yml @@ -24,9 +24,6 @@ jobs: run: | firstString=${{ github.ref_name }} secondString="develop" - echo $firstString - echo $secondString - echo ${firstString/format\//"$secondString"\/} echo ::set-env name=DEVELOPMENT_BRANCH::${firstString/format\//"$secondString"\/} - name: clone run: | diff --git a/.gitea/workflows/pr-closed.yml b/.gitea/workflows/pr-closed.yml index d3ace12..ba3f6fc 100644 --- a/.gitea/workflows/pr-closed.yml +++ b/.gitea/workflows/pr-closed.yml @@ -27,7 +27,7 @@ jobs: run: | firstString=${{ github.head_ref }} secondString="build" - echo ::set-env name=BUILD_BRANCH::${firststring/format\//"$secondstring"\/}s + echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/}s if_merged: if: github.event.pull_request.merged == true runs-on: ubuntu-latest diff --git a/.gitea/workflows/pr-reopened.yml b/.gitea/workflows/pr-reopened.yml index 2a88cc7..99705d2 100644 --- a/.gitea/workflows/pr-reopened.yml +++ b/.gitea/workflows/pr-reopened.yml @@ -33,7 +33,7 @@ jobs: run: | firstString=${{ github.ref_name }} secondString="build" - echo ::set-env name=BUILD_BRANCH::${firststring/format\//"$secondstring"\/} + echo ::set-env name=BUILD_BRANCH::${firstString/develop\//"$secondString"\/} - name: GIT commit and push all changed files env: CI_COMMIT_MESSAGE: Reopened PR copnverted to xml.