From f6e4ee92a303958457796363dc33457fff0099ac Mon Sep 17 00:00:00 2001 From: Marco Maatz Date: Thu, 24 Oct 2024 12:03:31 +0200 Subject: [PATCH 1/5] skip string --- .gitea/workflows/uploadArtifactWithFtp.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/uploadArtifactWithFtp.yaml b/.gitea/workflows/uploadArtifactWithFtp.yaml index 48898e3..7a13f94 100644 --- a/.gitea/workflows/uploadArtifactWithFtp.yaml +++ b/.gitea/workflows/uploadArtifactWithFtp.yaml @@ -43,8 +43,8 @@ jobs: curl -T ./$upload_name ${{ vars.FTP_SERVER_URL }}${{ inputs.ftpPath }} --user "${{ vars.FTP_USER }}:${{ vars.FTP_PASSWORD }}" echo "Uploading finished $upload_name" - echo "TXT Filename is ${{ inputs.txtFileName }}" - if [ "${{ inputs.txtFileName }}" != "" ] && [ "${{ inputs.txtFileContent }}" != "" ]; then + echo "TXT Filename is '${{ inputs.txtFileName }}'" + if [ "${{ inputs.txtFileName }}" != "skip" ]; then echo "Uploading additional Text File ${{ inputs.txtFileName }}" printf "%b" "${{ inputs.txtFileContent }}" > ${{ inputs.txtFileName }} curl -T ./${{ inputs.txtFileName }} ${{ vars.FTP_SERVER_URL }}${{ inputs.ftpPath }} --user "${{ vars.FTP_USER }}:${{ vars.FTP_PASSWORD }}" From c857300136e7044f9ad556d343062a2078e58887 Mon Sep 17 00:00:00 2001 From: Marco Maatz Date: Thu, 24 Oct 2024 12:08:10 +0200 Subject: [PATCH 2/5] skip when - --- .gitea/workflows/uploadArtifactWithFtp.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/uploadArtifactWithFtp.yaml b/.gitea/workflows/uploadArtifactWithFtp.yaml index 7a13f94..804ed20 100644 --- a/.gitea/workflows/uploadArtifactWithFtp.yaml +++ b/.gitea/workflows/uploadArtifactWithFtp.yaml @@ -44,7 +44,7 @@ jobs: echo "Uploading finished $upload_name" echo "TXT Filename is '${{ inputs.txtFileName }}'" - if [ "${{ inputs.txtFileName }}" != "skip" ]; then + if [ "${{ inputs.txtFileName }}" != "-" ]; then echo "Uploading additional Text File ${{ inputs.txtFileName }}" printf "%b" "${{ inputs.txtFileContent }}" > ${{ inputs.txtFileName }} curl -T ./${{ inputs.txtFileName }} ${{ vars.FTP_SERVER_URL }}${{ inputs.ftpPath }} --user "${{ vars.FTP_USER }}:${{ vars.FTP_PASSWORD }}" From 7392017f4842c74e9863e8a161a0e4961b4b0906 Mon Sep 17 00:00:00 2001 From: Marco Maatz Date: Thu, 24 Oct 2024 12:13:36 +0200 Subject: [PATCH 3/5] del --- .gitea/workflows/commitGit.yaml | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 .gitea/workflows/commitGit.yaml diff --git a/.gitea/workflows/commitGit.yaml b/.gitea/workflows/commitGit.yaml deleted file mode 100644 index 1d261b2..0000000 --- a/.gitea/workflows/commitGit.yaml +++ /dev/null @@ -1,24 +0,0 @@ -name: Commit Files to Git -on: - workflow_call: - inputs: - files: - required: true - type: string - message: - required: true - type: string - branch: - required: true - type: string -jobs: - CommitGit: - runs-on: ubuntu-latest - steps: - - name: Commit - run: | - git config user.name "${{ vars.GIT_DEPLOY_NAME }}" - git config user.email "${{ vars.GIT_DEPLOY_MAIL }}" - git add ${{ inputs.files }} - git commit -m "${{ inputs.message }}" - git push origin HEAD:${{ inputs.branch }} From c071156e35ec94215f239f1cc6f5195acf3e1e7c Mon Sep 17 00:00:00 2001 From: Marco Maatz Date: Thu, 24 Oct 2024 12:14:25 +0200 Subject: [PATCH 4/5] test --- .gitea/workflows/commitGit.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .gitea/workflows/commitGit.yaml diff --git a/.gitea/workflows/commitGit.yaml b/.gitea/workflows/commitGit.yaml new file mode 100644 index 0000000..1d261b2 --- /dev/null +++ b/.gitea/workflows/commitGit.yaml @@ -0,0 +1,24 @@ +name: Commit Files to Git +on: + workflow_call: + inputs: + files: + required: true + type: string + message: + required: true + type: string + branch: + required: true + type: string +jobs: + CommitGit: + runs-on: ubuntu-latest + steps: + - name: Commit + run: | + git config user.name "${{ vars.GIT_DEPLOY_NAME }}" + git config user.email "${{ vars.GIT_DEPLOY_MAIL }}" + git add ${{ inputs.files }} + git commit -m "${{ inputs.message }}" + git push origin HEAD:${{ inputs.branch }} From 381a5e2f3e7da8e4dbcf4a508ae92a948f98b1dc Mon Sep 17 00:00:00 2001 From: Marco Maatz Date: Thu, 24 Oct 2024 12:24:12 +0200 Subject: [PATCH 5/5] allow same version --- .gitea/workflows/setPackageVersion.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/setPackageVersion.yaml b/.gitea/workflows/setPackageVersion.yaml index e5eae1a..9395671 100644 --- a/.gitea/workflows/setPackageVersion.yaml +++ b/.gitea/workflows/setPackageVersion.yaml @@ -29,7 +29,7 @@ jobs: cd ${{ inputs.packagePath }} fi - npm version --no-git-tag-version ${{ inputs.version }} + npm version --allow-same-version --no-git-tag-version ${{ inputs.version }} echo "Change Directory back to $git_path" cd $git_path