From 10f84c3a55b3d711caf8a2606b3a2ee1be984352 Mon Sep 17 00:00:00 2001 From: Dmitry Kirdyashkin Date: Tue, 4 Jul 2023 00:32:10 +0300 Subject: [PATCH 1/9] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=BF=D0=B0=D0=B9=D0=BF=D0=BB=D0=B0=D0=B9=D0=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/pipeline.yml | 35 +++++++++++++++++++++++++++++++++++ helper-scripts | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 .gitea/workflows/pipeline.yml diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml new file mode 100644 index 0000000..4c0c890 --- /dev/null +++ b/.gitea/workflows/pipeline.yml @@ -0,0 +1,35 @@ +name: Create archive + +on: + push: + branches: + - 'dev' + +env: + REPOSITORY: ${{ gitea.repository }} + BUILD_NUMBER: ${{ gitea.run_number }} + REPO_AUTH_LOGIN: ${{ secrets.REPO_AUTH_LOGIN }} + REPO_AUTH_TOKEN: ${{ secrets.REPO_AUTH_TOKEN }} + BRANCH: ${{ gitea.ref_name }} + +jobs: + publish_image: + name: Publish image + runs-on: ubuntu-latest + + container: + image: gitea.kdiva.ru/infrastructure/archiver + credentials: + username: ${{ env.REPO_AUTH_LOGIN }} + password: ${{ env.REPO_AUTH_TOKEN }} + + steps: + - name: Checkout ${{env.REPOSITORY}} + uses: actions/checkout@v3 + with: + repository: ${{env.REPOSITORY}} + github-server-url: https://gitea.kdiva.ru + + - name: Create archive + run: | + zip -r -9 ${{env.REPOSITORY}}-${{env.BRANCH}}-${{env.BUILD_NUMBER}}.zip ./src/ diff --git a/helper-scripts b/helper-scripts index b1524b6..153edfd 160000 --- a/helper-scripts +++ b/helper-scripts @@ -1 +1 @@ -Subproject commit b1524b6710ab92045769dc50d63a85eb576197f8 +Subproject commit 153edfd6d4c91aa957c0b14171f5c676aa4cd58a From 67a276fa74beb279b1ce69f2ce484a513cdf9c9f Mon Sep 17 00:00:00 2001 From: Dmitry Kirdyashkin Date: Tue, 4 Jul 2023 16:08:48 +0300 Subject: [PATCH 3/9] f --- .gitea/workflows/pipeline.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml index 4c0c890..f949f0c 100644 --- a/.gitea/workflows/pipeline.yml +++ b/.gitea/workflows/pipeline.yml @@ -9,6 +9,7 @@ env: REPOSITORY: ${{ gitea.repository }} BUILD_NUMBER: ${{ gitea.run_number }} REPO_AUTH_LOGIN: ${{ secrets.REPO_AUTH_LOGIN }} + REPO_AUTH_PASSWORD: ${{ secrets.REPO_AUTH_PASSWORD }} REPO_AUTH_TOKEN: ${{ secrets.REPO_AUTH_TOKEN }} BRANCH: ${{ gitea.ref_name }} @@ -21,7 +22,7 @@ jobs: image: gitea.kdiva.ru/infrastructure/archiver credentials: username: ${{ env.REPO_AUTH_LOGIN }} - password: ${{ env.REPO_AUTH_TOKEN }} + password: ${{ env.REPO_AUTH_PASSWORD }} steps: - name: Checkout ${{env.REPOSITORY}} From a48c8cc08c5d64c574c8ba9b227b1b405a941039 Mon Sep 17 00:00:00 2001 From: Dmitry Kirdyashkin Date: Tue, 4 Jul 2023 16:12:23 +0300 Subject: [PATCH 4/9] f --- .gitea/workflows/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml index f949f0c..00da957 100644 --- a/.gitea/workflows/pipeline.yml +++ b/.gitea/workflows/pipeline.yml @@ -14,8 +14,8 @@ env: BRANCH: ${{ gitea.ref_name }} jobs: - publish_image: - name: Publish image + create_archive: + name: Create archive runs-on: ubuntu-latest container: From ce4ebae472b844e0cb544621f426df17d798f650 Mon Sep 17 00:00:00 2001 From: Dmitry Kirdyashkin Date: Tue, 4 Jul 2023 16:15:07 +0300 Subject: [PATCH 5/9] t --- .gitea/workflows/pipeline.yml | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml index 00da957..2d80fe8 100644 --- a/.gitea/workflows/pipeline.yml +++ b/.gitea/workflows/pipeline.yml @@ -18,19 +18,24 @@ jobs: name: Create archive runs-on: ubuntu-latest - container: - image: gitea.kdiva.ru/infrastructure/archiver - credentials: - username: ${{ env.REPO_AUTH_LOGIN }} - password: ${{ env.REPO_AUTH_PASSWORD }} + # container: + # image: gitea.kdiva.ru/infrastructure/archiver + # credentials: + # username: ${{ env.REPO_AUTH_LOGIN }} + # password: ${{ env.REPO_AUTH_PASSWORD }} steps: - - name: Checkout ${{env.REPOSITORY}} - uses: actions/checkout@v3 - with: - repository: ${{env.REPOSITORY}} - github-server-url: https://gitea.kdiva.ru + # - name: Checkout ${{env.REPOSITORY}} + # uses: actions/checkout@v3 + # with: + # repository: ${{env.REPOSITORY}} + # github-server-url: https://gitea.kdiva.ru - - name: Create archive + # - name: Create archive + # run: | + # zip -r -9 ${{env.REPOSITORY}}-${{env.BRANCH}}-${{env.BUILD_NUMBER}}.zip ./src/ + + - name: test run: | - zip -r -9 ${{env.REPOSITORY}}-${{env.BRANCH}}-${{env.BUILD_NUMBER}}.zip ./src/ + echo ${{ env.REPO_AUTH_LOGIN }} + echi ${{ env.REPO_AUTH_PASSWORD }} \ No newline at end of file From 4d25ea787354f3cc78fd24cb872725bd71179ba2 Mon Sep 17 00:00:00 2001 From: Dmitry Kirdyashkin Date: Tue, 4 Jul 2023 16:16:44 +0300 Subject: [PATCH 6/9] t --- .gitea/workflows/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml index 2d80fe8..4887b24 100644 --- a/.gitea/workflows/pipeline.yml +++ b/.gitea/workflows/pipeline.yml @@ -37,5 +37,5 @@ jobs: - name: test run: | - echo ${{ env.REPO_AUTH_LOGIN }} - echi ${{ env.REPO_AUTH_PASSWORD }} \ No newline at end of file + echo "${{ env.REPO_AUTH_LOGIN }}" + echi "${{ env.REPO_AUTH_PASSWORD }}" \ No newline at end of file From e60f9ca2b72c1fb2db7177ff14b7c3d924ef079a Mon Sep 17 00:00:00 2001 From: Dmitry Kirdyashkin Date: Tue, 4 Jul 2023 16:17:14 +0300 Subject: [PATCH 7/9] f --- .gitea/workflows/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml index 4887b24..515920c 100644 --- a/.gitea/workflows/pipeline.yml +++ b/.gitea/workflows/pipeline.yml @@ -38,4 +38,4 @@ jobs: - name: test run: | echo "${{ env.REPO_AUTH_LOGIN }}" - echi "${{ env.REPO_AUTH_PASSWORD }}" \ No newline at end of file + echo "${{ env.REPO_AUTH_PASSWORD }}" \ No newline at end of file From e9e1cd71fe06e2968a7898c6a62831e0b1124a48 Mon Sep 17 00:00:00 2001 From: Dmitry Kirdyashkin Date: Tue, 4 Jul 2023 16:18:28 +0300 Subject: [PATCH 8/9] t --- .gitea/workflows/pipeline.yml | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml index 515920c..4e0a61d 100644 --- a/.gitea/workflows/pipeline.yml +++ b/.gitea/workflows/pipeline.yml @@ -18,24 +18,19 @@ jobs: name: Create archive runs-on: ubuntu-latest - # container: - # image: gitea.kdiva.ru/infrastructure/archiver - # credentials: - # username: ${{ env.REPO_AUTH_LOGIN }} - # password: ${{ env.REPO_AUTH_PASSWORD }} + container: + image: gitea.kdiva.ru/infrastructure/archiver + credentials: + username: "${{ env.REPO_AUTH_LOGIN }}" + password: "${{ env.REPO_AUTH_PASSWORD }}" steps: - # - name: Checkout ${{env.REPOSITORY}} - # uses: actions/checkout@v3 - # with: - # repository: ${{env.REPOSITORY}} - # github-server-url: https://gitea.kdiva.ru + - name: Checkout + uses: actions/checkout@v3 + with: + repository: ${{env.REPOSITORY}} + github-server-url: https://gitea.kdiva.ru - # - name: Create archive - # run: | - # zip -r -9 ${{env.REPOSITORY}}-${{env.BRANCH}}-${{env.BUILD_NUMBER}}.zip ./src/ - - - name: test + - name: Create archive run: | - echo "${{ env.REPO_AUTH_LOGIN }}" - echo "${{ env.REPO_AUTH_PASSWORD }}" \ No newline at end of file + zip -r -9 "${{env.REPOSITORY}}-${{env.BRANCH}}-${{env.BUILD_NUMBER}}.zip" ./src/ From 097572b002c8b309631377a5572a31435b4a779e Mon Sep 17 00:00:00 2001 From: Dmitry Kirdyashkin Date: Tue, 4 Jul 2023 16:55:21 +0300 Subject: [PATCH 9/9] t --- .gitea/workflows/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/pipeline.yml b/.gitea/workflows/pipeline.yml index 4e0a61d..9f841b5 100644 --- a/.gitea/workflows/pipeline.yml +++ b/.gitea/workflows/pipeline.yml @@ -22,7 +22,7 @@ jobs: image: gitea.kdiva.ru/infrastructure/archiver credentials: username: "${{ env.REPO_AUTH_LOGIN }}" - password: "${{ env.REPO_AUTH_PASSWORD }}" + password: "${{ env.REPO_AUTH_TOKEN }}" steps: - name: Checkout