From b3d513ff2211379f6c9cf1b51d1e58a077bd252e Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Mon, 30 Jun 2025 16:14:35 +0500 Subject: [PATCH 01/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 65c34b3..b699e25 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -100,8 +100,34 @@ steps: - source version.env - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" - - git checkout develop + - git checkout test - git commit -am "Релиз $VERSION" - git tag "v$VERSION" - git push https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git develop - - git push https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" \ No newline at end of file + - git push https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" + + release-upload: + image: curlimages/curl:latest + environment: + FORGEJO_TOKEN: + from_secret: FORGEJO_TOKEN + commands: + - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) + - TAG="v$VERSION" + - DEB_PATH="../gonets_${VERSION}_amd64.deb" + - | + curl -s -X POST "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases" \ + -H "Authorization: token ${FORGEJO_TOKEN}" \ + -H "Content-Type: application/json" \ + -d '{ + "tag_name": "'$TAG'", + "name": "Релиз '$TAG'", + "body": "Сборка .deb пакета для версии '$TAG'", + "draft": false, + "prerelease": false + }' || true + - | + curl -s -X POST \ + -H "Authorization: token ${FORGEJO_TOKEN}" \ + -F "attachment=@$DEB_PATH" \ + "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$TAG/assets" From 9ea7efb91fc9b1dcd9c43a93c20e456c5575da1b Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Mon, 30 Jun 2025 16:15:00 +0500 Subject: [PATCH 02/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index b699e25..2c4d54e 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -109,8 +109,8 @@ steps: release-upload: image: curlimages/curl:latest environment: - FORGEJO_TOKEN: - from_secret: FORGEJO_TOKEN + GONETS: + from_secret: GONETS commands: - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) - TAG="v$VERSION" From 6463b293776a8cb7ed784c2aa2e0c3c0dc0c9e11 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Mon, 30 Jun 2025 16:31:01 +0500 Subject: [PATCH 03/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 2c4d54e..1b28d9a 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -97,7 +97,7 @@ steps: - echo "VERSION=$VERSION" > version.env # КОММИТ И ТЕГ НА ВЕТКУ DEVELOP - - source version.env + - . ./version.env - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" - git checkout test From 51d3aac75b749674077ab1a352d6588a390e110e Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Mon, 30 Jun 2025 16:46:18 +0500 Subject: [PATCH 04/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 1b28d9a..b62fb61 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -100,7 +100,7 @@ steps: - . ./version.env - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" - - git checkout test + - git checkout develop - git commit -am "Релиз $VERSION" - git tag "v$VERSION" - git push https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git develop From 022bcd0a19926c5cfbdc45b69f0a7aa53b504363 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Mon, 30 Jun 2025 17:02:12 +0500 Subject: [PATCH 05/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index b62fb61..a178bf5 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -100,6 +100,8 @@ steps: - . ./version.env - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" + - git fetch --all + - git branch -r - git checkout develop - git commit -am "Релиз $VERSION" - git tag "v$VERSION" From 88a6b9a7003dd292d0f33199251ee4d41253b517 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Mon, 30 Jun 2025 17:19:11 +0500 Subject: [PATCH 06/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index a178bf5..24b5153 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -102,6 +102,8 @@ steps: - git config user.email "s.galanskiy@gossys.dev" - git fetch --all - git branch -r + - git reset --hard + - git clean -fd - git checkout develop - git commit -am "Релиз $VERSION" - git tag "v$VERSION" From 59cf6f44dd5e9f22e6adb98cf013b33b0e5e8a74 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Mon, 30 Jun 2025 17:31:43 +0500 Subject: [PATCH 07/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 24b5153..5175b20 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -105,6 +105,8 @@ steps: - git reset --hard - git clean -fd - git checkout develop + - pwd + - git add . - git commit -am "Релиз $VERSION" - git tag "v$VERSION" - git push https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git develop From 9ee20ef905ea7f39c2793b38f70c4a8b522a9396 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Mon, 30 Jun 2025 17:45:55 +0500 Subject: [PATCH 08/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 5175b20..ec9f0e2 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -108,9 +108,9 @@ steps: - pwd - git add . - git commit -am "Релиз $VERSION" - - git tag "v$VERSION" + - git tag -f "v$VERSION" - git push https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git develop - - git push https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" + - git push -f https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" release-upload: image: curlimages/curl:latest From f2103f19c9de824aecbb02e3048dae7a581ca96f Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 10:49:03 +0500 Subject: [PATCH 09/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index ec9f0e2..210496c 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -2,12 +2,14 @@ when: event: [push, tag] branch: main +environment: + GONETS: + from_secret: GONETS + steps: checkout: image: debian:latest - environment: - GONETS: - from_secret: GONETS + commands: - pwd - echo $SHELL From b10df9218fc3500e7677c2125364136f701fc8ed Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 10:49:49 +0500 Subject: [PATCH 10/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 210496c..f1b318a 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -88,6 +88,7 @@ steps: - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/postinst /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/postrm /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/rules /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ + - echo "Токен: ${GONETS:0:4}****" # СБОРКА ДЕБИАН ПАКЕТА - cd .. @@ -111,6 +112,7 @@ steps: - git add . - git commit -am "Релиз $VERSION" - git tag -f "v$VERSION" + - echo "Токен: ${GONETS:0:4}****" - git push https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git develop - git push -f https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" From 82c65dcc2820a8691557a79ecf02055c11fb066d Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 10:50:12 +0500 Subject: [PATCH 11/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index f1b318a..0611fc5 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -88,7 +88,6 @@ steps: - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/postinst /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/postrm /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/rules /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - echo "Токен: ${GONETS:0:4}****" # СБОРКА ДЕБИАН ПАКЕТА - cd .. From bf4f2ef822bad3c42ecc3b29b81769a109f001e8 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 10:50:29 +0500 Subject: [PATCH 12/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 0611fc5..210496c 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -111,7 +111,6 @@ steps: - git add . - git commit -am "Релиз $VERSION" - git tag -f "v$VERSION" - - echo "Токен: ${GONETS:0:4}****" - git push https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git develop - git push -f https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" From b799b45908ccf5bc7fde1b0829869c2327e8464b Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 11:16:33 +0500 Subject: [PATCH 13/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 210496c..39511a9 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -2,13 +2,12 @@ when: event: [push, tag] branch: main -environment: - GONETS: - from_secret: GONETS - steps: checkout: image: debian:latest + environment: + GONETS: + from_secret: GONETS commands: - pwd From 68bcdf3a1fa9447aecf07967aebdafedab0ee8fc Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 11:17:08 +0500 Subject: [PATCH 14/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 39511a9..af28358 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -5,9 +5,9 @@ when: steps: checkout: image: debian:latest - environment: - GONETS: - from_secret: GONETS + environment: + GONETS: + from_secret: GONETS commands: - pwd From bd5faf17adab34d8ff6eecc7d5077939c73c1689 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 12:12:36 +0500 Subject: [PATCH 15/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index af28358..61f81d9 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -10,6 +10,7 @@ steps: from_secret: GONETS commands: + - echo "$GONETS" - pwd - echo $SHELL - rm -rf gonets From 8ebe6d874f8102ed478c2a08efbd613e08595959 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 12:27:01 +0500 Subject: [PATCH 16/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 61f81d9..a5b25be 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -111,8 +111,8 @@ steps: - git add . - git commit -am "Релиз $VERSION" - git tag -f "v$VERSION" - - git push https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git develop - - git push -f https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" + - git push https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git develop + - git push -f https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" release-upload: image: curlimages/curl:latest @@ -132,10 +132,10 @@ steps: "name": "Релиз '$TAG'", "body": "Сборка .deb пакета для версии '$TAG'", "draft": false, - "prerelease": false + "prerelease": true }' || true - | curl -s -X POST \ - -H "Authorization: token ${FORGEJO_TOKEN}" \ + -H "Authorization: token ${GONETS}" \ -F "attachment=@$DEB_PATH" \ "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$TAG/assets" From ef42df3f22565a7523b7859c3ca4ca64d1e224c9 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 12:44:21 +0500 Subject: [PATCH 17/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index a5b25be..25d76a1 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -2,13 +2,13 @@ when: event: [push, tag] branch: main +environment: + GONETS: + from_secret: GONETS + steps: checkout: image: debian:latest - environment: - GONETS: - from_secret: GONETS - commands: - echo "$GONETS" - pwd @@ -111,7 +111,8 @@ steps: - git add . - git commit -am "Релиз $VERSION" - git tag -f "v$VERSION" - - git push https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git develop + - echo "GONETS=${GONETS}" + - git push "https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop - git push -f https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" release-upload: From 6980c650f57ccbe88fc01c0479320abaa77c3085 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 12:46:58 +0500 Subject: [PATCH 18/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 25d76a1..9911e0c 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -2,13 +2,12 @@ when: event: [push, tag] branch: main -environment: - GONETS: - from_secret: GONETS - steps: checkout: image: debian:latest + environment: + GONETS: + from_secret: GONETS commands: - echo "$GONETS" - pwd From fce799a9d51e5ce4bc024623977d16882e503cb4 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 12:49:50 +0500 Subject: [PATCH 19/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 9911e0c..6ef6499 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -9,7 +9,7 @@ steps: GONETS: from_secret: GONETS commands: - - echo "$GONETS" + - echo $${GONETS} - pwd - echo $SHELL - rm -rf gonets From c9884a96e3115db78936fa4c0c4ff0c7fab4e7dc Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 13:51:07 +0500 Subject: [PATCH 20/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 6ef6499..547d110 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -9,6 +9,7 @@ steps: GONETS: from_secret: GONETS commands: + - export GONETS=1d566252a664fd4a6b1d2cfd05502e44e3548b84 - echo $${GONETS} - pwd - echo $SHELL @@ -111,7 +112,7 @@ steps: - git commit -am "Релиз $VERSION" - git tag -f "v$VERSION" - echo "GONETS=${GONETS}" - - git push "https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop + - git push "https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop - git push -f https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" release-upload: From 54f96e03246b011873ead013ee2a8ddd388571d6 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 14:04:11 +0500 Subject: [PATCH 21/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 140 ++---------------------------------- 1 file changed, 5 insertions(+), 135 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 547d110..9d66433 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -1,142 +1,12 @@ -when: - event: [push, tag] - branch: main - steps: - checkout: + push: image: debian:latest environment: GONETS: from_secret: GONETS commands: - - export GONETS=1d566252a664fd4a6b1d2cfd05502e44e3548b84 - - echo $${GONETS} - - pwd - - echo $SHELL - - rm -rf gonets - # ПОДГОТОВКА ГИТА И КЛОНИРОВАНИЕ GONETS - - apt update - - apt install -y git git-lfs - - git lfs install - - # УСТАНОВКА НЕОБХОДИМЫХ ЗАВИСИМОСТЕЙ НА СИСТЕМЕ - - apt update - - apt install -y python3 tree libnss3 libnss3-dev libnspr4 libnspr4-dev libasound2 libasound2-dev python3.11-venv python3-pip python3-poetry nodejs npm debhelper devscripts build-essential fakeroot dh-make dpkg-dev cmake libgirepository1.0-dev gobject-introspection libcairo2-dev pkg-config python3-dev libdbus-1-dev - - python3 --version - - node -v - - npm -v - - # ПОДГОТОВКА СПИСКА PYTHON ЗАВИСИМОСТЕЙ GONETS - - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - - rm -rf /root/.local/share/pypoetry - - rm -rf /root/.poetry - - rm -rf /usr/bin/poetry - - pip install pipx - - pipx ensurepath - - pipx install poetry - - echo 'export PATH="$HOME/.local/bin:$PATH"' >> /root/.bashrc - - . /root/.bashrc - - poetry --version - - cd SRV - - poetry env activate - - poetry add poetry-plugin-export - - poetry install - - poetry self update - - rm -f requirements.txt - - poetry run poetry export -f requirements.txt --output requirements.txt --without-hashes - - # ПОДГОТОВКА И СБОРКА FRONTEND ЧАСТИ GONETS - - pwd - - cd .. - - pwd - - cd FRONT/DEV - - pwd - - npm install - - npm run package - - cd dist/gonets-linux-x64/resources/app - - pwd - - npm run build - - sed -i 's#href="/assets/#href="./assets/#g' dist/index.html - - sed -i 's#src="/assets/#src="./assets/#g' dist/index.html - - cd ../../../../.. - - pwd - - rm -rf BUILD/* - - cp -r DEV/dist/gonets-linux-x64/* BUILD/ - - rm -rf DEV - - # ИНИЦИАЛИЗАЦИЯ DEBIAN КОНФИГУРАЦИЙ ДЛЯ СБОРКИ - - cd .. - - pwd - - cd .. - - pwd - - mv gonets gonets-0.1 - - cd gonets-0.1 - - pwd - - ls - - DEBEMAIL="devteam@gossys.dev" DEBFULLNAME="GOSSYS LLC" dh_make --single -y --createorig - - cd debian/ - - rm -f *.ex - - rm -f README.* - - # КЛОНИРОВАНИЕ НЕОБХОДИМЫХ ШАБЛОНОВ КОНФИГОВ ДЕБИАНА ДЛЯ СБОРКИ - - mkdir -p /woodpecker/src/dev.gossys.dev/s.galanskiy/templates - - git clone https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets-debian-template.git /woodpecker/src/dev.gossys.dev/s.galanskiy/templates - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/changelog /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/control /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/copyright /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/install /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/postinst /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/postrm /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/rules /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - # СБОРКА ДЕБИАН ПАКЕТА - - cd .. - - pwd - - dpkg-buildpackage -us -uc -b - - # ИЗВЛЕЧЕНИЕ ВЕРСИИ ПАКЕТА ДЛЯ КОММИТА - - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) - - echo "VERSION=$VERSION" > version.env - - # КОММИТ И ТЕГ НА ВЕТКУ DEVELOP - - . ./version.env - - git config user.name "s.galanskiy" - - git config user.email "s.galanskiy@gossys.dev" - - git fetch --all - - git branch -r - - git reset --hard - - git clean -fd - - git checkout develop - - pwd - - git add . - - git commit -am "Релиз $VERSION" - - git tag -f "v$VERSION" - - echo "GONETS=${GONETS}" + - apt update && apt install -y git + - git config --global user.name "s.galanskiy" + - git config --global user.email "s.galanskiy@gossys.dev" + - echo "GONETS=$GONETS" - git push "https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop - - git push -f https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" - - release-upload: - image: curlimages/curl:latest - environment: - GONETS: - from_secret: GONETS - commands: - - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) - - TAG="v$VERSION" - - DEB_PATH="../gonets_${VERSION}_amd64.deb" - - | - curl -s -X POST "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases" \ - -H "Authorization: token ${FORGEJO_TOKEN}" \ - -H "Content-Type: application/json" \ - -d '{ - "tag_name": "'$TAG'", - "name": "Релиз '$TAG'", - "body": "Сборка .deb пакета для версии '$TAG'", - "draft": false, - "prerelease": true - }' || true - - | - curl -s -X POST \ - -H "Authorization: token ${GONETS}" \ - -F "attachment=@$DEB_PATH" \ - "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$TAG/assets" From f73f8f9c141c4ac72cbee1b996422d8194ae1c7d Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 14:05:40 +0500 Subject: [PATCH 22/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 9d66433..26c47db 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -9,4 +9,9 @@ steps: - git config --global user.name "s.galanskiy" - git config --global user.email "s.galanskiy@gossys.dev" - echo "GONETS=$GONETS" + - git fetch --all + - git branch -r + - git reset --hard + - git clean -fd + - git checkout develop - git push "https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop From 75271f7003ed920af131eefb2adbf319f755336d Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 14:06:41 +0500 Subject: [PATCH 23/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 26c47db..2575b13 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -14,4 +14,4 @@ steps: - git reset --hard - git clean -fd - git checkout develop - - git push "https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop + - git push "https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop From 9b8fdbf8b6e98c1f03d51ad3467c815566fa6c43 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 14:08:31 +0500 Subject: [PATCH 24/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 2575b13..4b8bed9 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -5,13 +5,4 @@ steps: GONETS: from_secret: GONETS commands: - - apt update && apt install -y git - - git config --global user.name "s.galanskiy" - - git config --global user.email "s.galanskiy@gossys.dev" - - echo "GONETS=$GONETS" - - git fetch --all - - git branch -r - - git reset --hard - - git clean -fd - - git checkout develop - - git push "https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop + - ls -la From 00a9346594bed0dba34d3cd5b14548d4c7a4525d Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 14:10:31 +0500 Subject: [PATCH 25/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 4b8bed9..6c4b988 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -5,4 +5,20 @@ steps: GONETS: from_secret: GONETS commands: - - ls -la + - apt update && apt install -y git + - git config --global user.name "s.galanskiy" + - git config --global user.email "s.galanskiy@gossys.dev" + + # 👉 клонируем репозиторий + - git clone "https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" + + # 👉 переключаемся на нужную ветку (если не по умолчанию) + - git checkout develop || git checkout -b develop + + # 👉 делаем фиктивный коммит (для теста) + - echo "trigger" > .woodpecker-test + - git add .woodpecker-test + - git commit -m "test: trigger push to develop" + + # 👉 пушим + - git push "https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop From 4ffa002db34c0c83797347c081b17c42456c1d3c Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 14:11:02 +0500 Subject: [PATCH 26/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 6c4b988..ffebf6b 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -9,16 +9,8 @@ steps: - git config --global user.name "s.galanskiy" - git config --global user.email "s.galanskiy@gossys.dev" - # 👉 клонируем репозиторий - - git clone "https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" - - # 👉 переключаемся на нужную ветку (если не по умолчанию) - git checkout develop || git checkout -b develop - # 👉 делаем фиктивный коммит (для теста) - - echo "trigger" > .woodpecker-test - - git add .woodpecker-test - git commit -m "test: trigger push to develop" - # 👉 пушим - git push "https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop From f6d79a663b830b5da2fa396285558bd5a9bb5139 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 14:11:16 +0500 Subject: [PATCH 27/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 138 ++++++++++++++++++++++++++++++++++-- 1 file changed, 132 insertions(+), 6 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index ffebf6b..547d110 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -1,16 +1,142 @@ +when: + event: [push, tag] + branch: main + steps: - push: + checkout: image: debian:latest environment: GONETS: from_secret: GONETS commands: - - apt update && apt install -y git - - git config --global user.name "s.galanskiy" - - git config --global user.email "s.galanskiy@gossys.dev" + - export GONETS=1d566252a664fd4a6b1d2cfd05502e44e3548b84 + - echo $${GONETS} + - pwd + - echo $SHELL + - rm -rf gonets + # ПОДГОТОВКА ГИТА И КЛОНИРОВАНИЕ GONETS + - apt update + - apt install -y git git-lfs + - git lfs install - - git checkout develop || git checkout -b develop + # УСТАНОВКА НЕОБХОДИМЫХ ЗАВИСИМОСТЕЙ НА СИСТЕМЕ + - apt update + - apt install -y python3 tree libnss3 libnss3-dev libnspr4 libnspr4-dev libasound2 libasound2-dev python3.11-venv python3-pip python3-poetry nodejs npm debhelper devscripts build-essential fakeroot dh-make dpkg-dev cmake libgirepository1.0-dev gobject-introspection libcairo2-dev pkg-config python3-dev libdbus-1-dev + - python3 --version + - node -v + - npm -v - - git commit -m "test: trigger push to develop" + # ПОДГОТОВКА СПИСКА PYTHON ЗАВИСИМОСТЕЙ GONETS + - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED + - rm -rf /root/.local/share/pypoetry + - rm -rf /root/.poetry + - rm -rf /usr/bin/poetry + - pip install pipx + - pipx ensurepath + - pipx install poetry + - echo 'export PATH="$HOME/.local/bin:$PATH"' >> /root/.bashrc + - . /root/.bashrc + - poetry --version + - cd SRV + - poetry env activate + - poetry add poetry-plugin-export + - poetry install + - poetry self update + - rm -f requirements.txt + - poetry run poetry export -f requirements.txt --output requirements.txt --without-hashes + # ПОДГОТОВКА И СБОРКА FRONTEND ЧАСТИ GONETS + - pwd + - cd .. + - pwd + - cd FRONT/DEV + - pwd + - npm install + - npm run package + - cd dist/gonets-linux-x64/resources/app + - pwd + - npm run build + - sed -i 's#href="/assets/#href="./assets/#g' dist/index.html + - sed -i 's#src="/assets/#src="./assets/#g' dist/index.html + - cd ../../../../.. + - pwd + - rm -rf BUILD/* + - cp -r DEV/dist/gonets-linux-x64/* BUILD/ + - rm -rf DEV + + # ИНИЦИАЛИЗАЦИЯ DEBIAN КОНФИГУРАЦИЙ ДЛЯ СБОРКИ + - cd .. + - pwd + - cd .. + - pwd + - mv gonets gonets-0.1 + - cd gonets-0.1 + - pwd + - ls + - DEBEMAIL="devteam@gossys.dev" DEBFULLNAME="GOSSYS LLC" dh_make --single -y --createorig + - cd debian/ + - rm -f *.ex + - rm -f README.* + + # КЛОНИРОВАНИЕ НЕОБХОДИМЫХ ШАБЛОНОВ КОНФИГОВ ДЕБИАНА ДЛЯ СБОРКИ + - mkdir -p /woodpecker/src/dev.gossys.dev/s.galanskiy/templates + - git clone https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets-debian-template.git /woodpecker/src/dev.gossys.dev/s.galanskiy/templates + - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/changelog /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ + - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/control /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ + - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/copyright /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ + - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/install /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ + - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/postinst /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ + - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/postrm /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ + - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/rules /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ + + # СБОРКА ДЕБИАН ПАКЕТА + - cd .. + - pwd + - dpkg-buildpackage -us -uc -b + + # ИЗВЛЕЧЕНИЕ ВЕРСИИ ПАКЕТА ДЛЯ КОММИТА + - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) + - echo "VERSION=$VERSION" > version.env + + # КОММИТ И ТЕГ НА ВЕТКУ DEVELOP + - . ./version.env + - git config user.name "s.galanskiy" + - git config user.email "s.galanskiy@gossys.dev" + - git fetch --all + - git branch -r + - git reset --hard + - git clean -fd + - git checkout develop + - pwd + - git add . + - git commit -am "Релиз $VERSION" + - git tag -f "v$VERSION" + - echo "GONETS=${GONETS}" - git push "https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop + - git push -f https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" + + release-upload: + image: curlimages/curl:latest + environment: + GONETS: + from_secret: GONETS + commands: + - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) + - TAG="v$VERSION" + - DEB_PATH="../gonets_${VERSION}_amd64.deb" + - | + curl -s -X POST "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases" \ + -H "Authorization: token ${FORGEJO_TOKEN}" \ + -H "Content-Type: application/json" \ + -d '{ + "tag_name": "'$TAG'", + "name": "Релиз '$TAG'", + "body": "Сборка .deb пакета для версии '$TAG'", + "draft": false, + "prerelease": true + }' || true + - | + curl -s -X POST \ + -H "Authorization: token ${GONETS}" \ + -F "attachment=@$DEB_PATH" \ + "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$TAG/assets" From 4674584e6f7cf299a8a94074893508fe9805fae8 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 16:22:15 +0500 Subject: [PATCH 28/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 547d110..8e1df79 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -9,11 +9,6 @@ steps: GONETS: from_secret: GONETS commands: - - export GONETS=1d566252a664fd4a6b1d2cfd05502e44e3548b84 - - echo $${GONETS} - - pwd - - echo $SHELL - - rm -rf gonets # ПОДГОТОВКА ГИТА И КЛОНИРОВАНИЕ GONETS - apt update - apt install -y git git-lfs @@ -112,7 +107,8 @@ steps: - git commit -am "Релиз $VERSION" - git tag -f "v$VERSION" - echo "GONETS=${GONETS}" - - git push "https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop + #- git push "https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop + - git push git@dev.gossys.dev:s.galanskiy/gonets.git develop - git push -f https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" release-upload: From 58e0788aeef641ab380e5c382c4f5d039b5b305d Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Tue, 1 Jul 2025 16:39:56 +0500 Subject: [PATCH 29/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 8e1df79..490feb1 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -16,7 +16,7 @@ steps: # УСТАНОВКА НЕОБХОДИМЫХ ЗАВИСИМОСТЕЙ НА СИСТЕМЕ - apt update - - apt install -y python3 tree libnss3 libnss3-dev libnspr4 libnspr4-dev libasound2 libasound2-dev python3.11-venv python3-pip python3-poetry nodejs npm debhelper devscripts build-essential fakeroot dh-make dpkg-dev cmake libgirepository1.0-dev gobject-introspection libcairo2-dev pkg-config python3-dev libdbus-1-dev + - apt install -y python3 openssh-server tree libnss3 libnss3-dev libnspr4 libnspr4-dev libasound2 libasound2-dev python3.11-venv python3-pip python3-poetry nodejs npm debhelper devscripts build-essential fakeroot dh-make dpkg-dev cmake libgirepository1.0-dev gobject-introspection libcairo2-dev pkg-config python3-dev libdbus-1-dev - python3 --version - node -v - npm -v @@ -108,7 +108,9 @@ steps: - git tag -f "v$VERSION" - echo "GONETS=${GONETS}" #- git push "https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop - - git push git@dev.gossys.dev:s.galanskiy/gonets.git develop + - echo "https://s.galanskiy:${GONETS}@dev.gossys.dev" > ~/.git-credentials + - git config --global credential.helper store + - git push https://dev.gossys.dev/s.galanskiy/gonets.git develop - git push -f https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" release-upload: From 8a26900578a92830f757f825b2cc3e58584365c9 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 10:33:20 +0500 Subject: [PATCH 30/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 124 ------------------------------------ 1 file changed, 124 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 490feb1..b56ffea 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -13,128 +13,4 @@ steps: - apt update - apt install -y git git-lfs - git lfs install - - # УСТАНОВКА НЕОБХОДИМЫХ ЗАВИСИМОСТЕЙ НА СИСТЕМЕ - - apt update - - apt install -y python3 openssh-server tree libnss3 libnss3-dev libnspr4 libnspr4-dev libasound2 libasound2-dev python3.11-venv python3-pip python3-poetry nodejs npm debhelper devscripts build-essential fakeroot dh-make dpkg-dev cmake libgirepository1.0-dev gobject-introspection libcairo2-dev pkg-config python3-dev libdbus-1-dev - - python3 --version - - node -v - - npm -v - - # ПОДГОТОВКА СПИСКА PYTHON ЗАВИСИМОСТЕЙ GONETS - - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - - rm -rf /root/.local/share/pypoetry - - rm -rf /root/.poetry - - rm -rf /usr/bin/poetry - - pip install pipx - - pipx ensurepath - - pipx install poetry - - echo 'export PATH="$HOME/.local/bin:$PATH"' >> /root/.bashrc - - . /root/.bashrc - - poetry --version - - cd SRV - - poetry env activate - - poetry add poetry-plugin-export - - poetry install - - poetry self update - - rm -f requirements.txt - - poetry run poetry export -f requirements.txt --output requirements.txt --without-hashes - - # ПОДГОТОВКА И СБОРКА FRONTEND ЧАСТИ GONETS - - pwd - - cd .. - - pwd - - cd FRONT/DEV - - pwd - - npm install - - npm run package - - cd dist/gonets-linux-x64/resources/app - - pwd - - npm run build - - sed -i 's#href="/assets/#href="./assets/#g' dist/index.html - - sed -i 's#src="/assets/#src="./assets/#g' dist/index.html - - cd ../../../../.. - - pwd - - rm -rf BUILD/* - - cp -r DEV/dist/gonets-linux-x64/* BUILD/ - - rm -rf DEV - - # ИНИЦИАЛИЗАЦИЯ DEBIAN КОНФИГУРАЦИЙ ДЛЯ СБОРКИ - - cd .. - - pwd - - cd .. - - pwd - - mv gonets gonets-0.1 - - cd gonets-0.1 - - pwd - - ls - - DEBEMAIL="devteam@gossys.dev" DEBFULLNAME="GOSSYS LLC" dh_make --single -y --createorig - - cd debian/ - - rm -f *.ex - - rm -f README.* - - # КЛОНИРОВАНИЕ НЕОБХОДИМЫХ ШАБЛОНОВ КОНФИГОВ ДЕБИАНА ДЛЯ СБОРКИ - - mkdir -p /woodpecker/src/dev.gossys.dev/s.galanskiy/templates - - git clone https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets-debian-template.git /woodpecker/src/dev.gossys.dev/s.galanskiy/templates - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/changelog /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/control /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/copyright /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/install /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/postinst /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/postrm /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/rules /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - # СБОРКА ДЕБИАН ПАКЕТА - - cd .. - - pwd - - dpkg-buildpackage -us -uc -b - - # ИЗВЛЕЧЕНИЕ ВЕРСИИ ПАКЕТА ДЛЯ КОММИТА - - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) - - echo "VERSION=$VERSION" > version.env - - # КОММИТ И ТЕГ НА ВЕТКУ DEVELOP - - . ./version.env - - git config user.name "s.galanskiy" - - git config user.email "s.galanskiy@gossys.dev" - - git fetch --all - - git branch -r - - git reset --hard - - git clean -fd - - git checkout develop - - pwd - - git add . - - git commit -am "Релиз $VERSION" - - git tag -f "v$VERSION" - echo "GONETS=${GONETS}" - #- git push "https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop - - echo "https://s.galanskiy:${GONETS}@dev.gossys.dev" > ~/.git-credentials - - git config --global credential.helper store - - git push https://dev.gossys.dev/s.galanskiy/gonets.git develop - - git push -f https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" - - release-upload: - image: curlimages/curl:latest - environment: - GONETS: - from_secret: GONETS - commands: - - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) - - TAG="v$VERSION" - - DEB_PATH="../gonets_${VERSION}_amd64.deb" - - | - curl -s -X POST "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases" \ - -H "Authorization: token ${FORGEJO_TOKEN}" \ - -H "Content-Type: application/json" \ - -d '{ - "tag_name": "'$TAG'", - "name": "Релиз '$TAG'", - "body": "Сборка .deb пакета для версии '$TAG'", - "draft": false, - "prerelease": true - }' || true - - | - curl -s -X POST \ - -H "Authorization: token ${GONETS}" \ - -F "attachment=@$DEB_PATH" \ - "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$TAG/assets" From eba80433d09b845a16bad6217e52a8d783eac4f7 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 10:51:41 +0500 Subject: [PATCH 31/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index b56ffea..efbdcd7 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -5,9 +5,7 @@ when: steps: checkout: image: debian:latest - environment: - GONETS: - from_secret: GONETS + secrets: GONETS commands: # ПОДГОТОВКА ГИТА И КЛОНИРОВАНИЕ GONETS - apt update From 4301aeb417b7fe090cde482720cf1f4adfdd43da Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 10:51:57 +0500 Subject: [PATCH 32/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index efbdcd7..9cda4a4 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -5,7 +5,7 @@ when: steps: checkout: image: debian:latest - secrets: GONETS + secrets: [GONETS] commands: # ПОДГОТОВКА ГИТА И КЛОНИРОВАНИЕ GONETS - apt update From a3d7192d121f500eb5858c75cc53eab0e75c5f80 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 10:53:40 +0500 Subject: [PATCH 33/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 9cda4a4..600ae6e 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -5,7 +5,9 @@ when: steps: checkout: image: debian:latest - secrets: [GONETS] + environment: + test: + from_secret: GONETS commands: # ПОДГОТОВКА ГИТА И КЛОНИРОВАНИЕ GONETS - apt update From 054743a497c17d64ebd02c9751e370c346a82405 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 10:54:33 +0500 Subject: [PATCH 34/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 600ae6e..e3612f1 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -14,3 +14,4 @@ steps: - apt install -y git git-lfs - git lfs install - echo "GONETS=${GONETS}" + - git push "https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop From 4e564e4722beee20a2ed9a9f5809c673aa6c7555 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 10:55:48 +0500 Subject: [PATCH 35/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index e3612f1..cbd2a0a 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -14,4 +14,4 @@ steps: - apt install -y git git-lfs - git lfs install - echo "GONETS=${GONETS}" - - git push "https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop + - git push "https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop From 7f3e4cba762f3b0c28cea980244f97060ba0f9bd Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 10:58:00 +0500 Subject: [PATCH 36/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index cbd2a0a..236727a 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -14,4 +14,4 @@ steps: - apt install -y git git-lfs - git lfs install - echo "GONETS=${GONETS}" - - git push "https://${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git" develop + - git push origin develop From ff9b3b3688f4b7d85520ea80872690f52333a36f Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 10:59:24 +0500 Subject: [PATCH 37/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 236727a..79354e2 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -14,4 +14,9 @@ steps: - apt install -y git git-lfs - git lfs install - echo "GONETS=${GONETS}" - - git push origin develop + - git fetch --all + - git branch -r + - git reset --hard + - git clean -fd + - git checkout develop + - git push -u origin develop From 6008538ddb487d4230b9b141ca327c77beaeb614 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:00:29 +0500 Subject: [PATCH 38/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 79354e2..c3b323f 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -14,6 +14,8 @@ steps: - apt install -y git git-lfs - git lfs install - echo "GONETS=${GONETS}" + - git config user.name "s.galanskiy" + - git config user.email "s.galanskiy@gossys.dev" - git fetch --all - git branch -r - git reset --hard From 2710c6564dd6f0bed712936f94c219af73cc5bee Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:02:30 +0500 Subject: [PATCH 39/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index c3b323f..0bdfecb 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -6,7 +6,7 @@ steps: checkout: image: debian:latest environment: - test: + GONETS: from_secret: GONETS commands: # ПОДГОТОВКА ГИТА И КЛОНИРОВАНИЕ GONETS From d2c8caa1e2f7a693086b0622ee0ccb47b7ec6b41 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:14:20 +0500 Subject: [PATCH 40/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 0bdfecb..1424110 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -5,7 +5,7 @@ when: steps: checkout: image: debian:latest - environment: + settings: GONETS: from_secret: GONETS commands: From a6217f6e647f38d231890ddd88ac04950ff2b6f0 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:15:22 +0500 Subject: [PATCH 41/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 1424110..6c6604d 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -5,11 +5,12 @@ when: steps: checkout: image: debian:latest - settings: + environment: GONETS: from_secret: GONETS commands: # ПОДГОТОВКА ГИТА И КЛОНИРОВАНИЕ GONETS + - echo $${TOKEN_ENV} - apt update - apt install -y git git-lfs - git lfs install From f731d92fbe841657b4e0d4d3208d8959869a1d66 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:16:39 +0500 Subject: [PATCH 42/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 6c6604d..ac1f30d 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -10,7 +10,7 @@ steps: from_secret: GONETS commands: # ПОДГОТОВКА ГИТА И КЛОНИРОВАНИЕ GONETS - - echo $${TOKEN_ENV} + - echo $${GONETS} - apt update - apt install -y git git-lfs - git lfs install From 29ea5bf7d4ac1ef4dd309114fe6ec66c069f42e2 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:17:58 +0500 Subject: [PATCH 43/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index ac1f30d..c980e71 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -1,3 +1,9 @@ +clone: + git: + image: woodpeckerci/plugin-git + settings: + lfs: true + when: event: [push, tag] branch: main @@ -5,21 +11,19 @@ when: steps: checkout: image: debian:latest - environment: + environment: GONETS: from_secret: GONETS commands: - # ПОДГОТОВКА ГИТА И КЛОНИРОВАНИЕ GONETS - - echo $${GONETS} - apt update - apt install -y git git-lfs - git lfs install - - echo "GONETS=${GONETS}" + - echo "GONETS=${GONETS:0:4}" + - test -n "${GONETS}" || (echo "Ошибка: GONETS пустая" && exit 1) - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" + - git remote set-url origin https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git - git fetch --all - - git branch -r - - git reset --hard - - git clean -fd - git checkout develop - - git push -u origin develop + - git commit --allow-empty -m "Тестовый коммит" + - git push -u origin develop \ No newline at end of file From e5703ee62a19b25e10af3861b8dd57fe8916ca7f Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:18:22 +0500 Subject: [PATCH 44/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index c980e71..b51c5c5 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -15,10 +15,10 @@ steps: GONETS: from_secret: GONETS commands: + - echo $${GONETS} - apt update - apt install -y git git-lfs - git lfs install - - echo "GONETS=${GONETS:0:4}" - test -n "${GONETS}" || (echo "Ошибка: GONETS пустая" && exit 1) - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" From 4f52480f3d17885b3c437d70c5c20efb75e58f0e Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:18:36 +0500 Subject: [PATCH 45/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index b51c5c5..e75f9fc 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -19,7 +19,6 @@ steps: - apt update - apt install -y git git-lfs - git lfs install - - test -n "${GONETS}" || (echo "Ошибка: GONETS пустая" && exit 1) - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" - git remote set-url origin https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git From fd459cc4547ecb83c4e3f1be24ae72f0ff9f55d9 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:22:26 +0500 Subject: [PATCH 46/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index e75f9fc..e506349 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -21,6 +21,7 @@ steps: - git lfs install - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" + - git ls-remote https://s.galanskiy:@dev.gossys.dev/s.galanskiy/gonets.git - git remote set-url origin https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git - git fetch --all - git checkout develop From 7f9183432b914801b08c3391fdc6bf1078378a36 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:23:42 +0500 Subject: [PATCH 47/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index e506349..8e9bbcd 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -21,8 +21,8 @@ steps: - git lfs install - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" - - git ls-remote https://s.galanskiy:@dev.gossys.dev/s.galanskiy/gonets.git - git remote set-url origin https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git + - git ls-remote origin - git fetch --all - git checkout develop - git commit --allow-empty -m "Тестовый коммит" From 0a0f38a2adf6f336677bb003ff3df42e555a2eaa Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:32:27 +0500 Subject: [PATCH 48/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 8e9bbcd..bb574dd 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -15,13 +15,17 @@ steps: GONETS: from_secret: GONETS commands: - - echo $${GONETS} - apt update - apt install -y git git-lfs - git lfs install + - echo $${GONETS} - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" - - git remote set-url origin https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets.git + - git remote -v + - rm -f ~/.git-credentials + - git config --global --unset credential.helper + - echo "https://s.galanskiy:${GONETS}@dev.gossys.dev" > ~/.git-credentials + - git config --global credential.helper store - git ls-remote origin - git fetch --all - git checkout develop From 6e4986aa4c2602f441a988952bd16f444a8df0f4 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:34:55 +0500 Subject: [PATCH 49/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index bb574dd..874a1da 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -18,14 +18,12 @@ steps: - apt update - apt install -y git git-lfs - git lfs install - - echo $${GONETS} - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" - git remote -v - rm -f ~/.git-credentials - - git config --global --unset credential.helper + - git config --global credential.helper store || true - echo "https://s.galanskiy:${GONETS}@dev.gossys.dev" > ~/.git-credentials - - git config --global credential.helper store - git ls-remote origin - git fetch --all - git checkout develop From a4066069ff1f541ba9a24f3f35cc3523d06b050c Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:42:40 +0500 Subject: [PATCH 50/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 874a1da..fa3d883 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -18,11 +18,13 @@ steps: - apt update - apt install -y git git-lfs - git lfs install + - echo $${GONETS} - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" - git remote -v - rm -f ~/.git-credentials - - git config --global credential.helper store || true + - git config --global --unset credential.helper + - git config --global credential.helper store - echo "https://s.galanskiy:${GONETS}@dev.gossys.dev" > ~/.git-credentials - git ls-remote origin - git fetch --all From 989b2ea45f25bb0ff1c7eca03e6151da6af9b214 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:44:58 +0500 Subject: [PATCH 51/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index fa3d883..49c5817 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -10,24 +10,14 @@ when: steps: checkout: - image: debian:latest - environment: - GONETS: - from_secret: GONETS + image: woodpeckerci/plugin-git + settings: + remote: ssh://git@dev.gossys.dev/s.galanskiy/gonets.git + branch: develop + ssh_key: + from_secret: push commands: - - apt update - - apt install -y git git-lfs - - git lfs install - - echo $${GONETS} - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" - - git remote -v - - rm -f ~/.git-credentials - - git config --global --unset credential.helper - - git config --global credential.helper store - - echo "https://s.galanskiy:${GONETS}@dev.gossys.dev" > ~/.git-credentials - - git ls-remote origin - - git fetch --all - - git checkout develop - git commit --allow-empty -m "Тестовый коммит" - - git push -u origin develop \ No newline at end of file + - git push origin develop \ No newline at end of file From 32e1878ee808eafa490b518864802643b09e9477 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:46:23 +0500 Subject: [PATCH 52/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 49c5817..7bba980 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -16,8 +16,12 @@ steps: branch: develop ssh_key: from_secret: push + + commit: + image: debian:latest commands: + - apt update && apt install -y git - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" - git commit --allow-empty -m "Тестовый коммит" - - git push origin develop \ No newline at end of file + - git push origin develop From 3ac0f336f39eef36f37edd58b05bdece72dc5741 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 11:46:42 +0500 Subject: [PATCH 53/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 7bba980..ac4319c 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -15,7 +15,7 @@ steps: remote: ssh://git@dev.gossys.dev/s.galanskiy/gonets.git branch: develop ssh_key: - from_secret: push + from_secret: GONETS commit: image: debian:latest From 9780bd97445b5ade3ac98e86a411cba0da0cabb6 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 12:20:18 +0500 Subject: [PATCH 54/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index ac4319c..02cd1ec 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -1,27 +1,27 @@ -clone: - git: - image: woodpeckerci/plugin-git - settings: - lfs: true - when: event: [push, tag] branch: main steps: checkout: - image: woodpeckerci/plugin-git - settings: - remote: ssh://git@dev.gossys.dev/s.galanskiy/gonets.git - branch: develop - ssh_key: - from_secret: GONETS - - commit: image: debian:latest + environment: + GONETS: + from_secret: GONETS commands: - - apt update && apt install -y git + - apt update + - apt install -y git git-lfs + - git lfs install + - echo $${GONETS} - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" + - git remote -v + - rm -f ~/.git-credentials + - git config --global --unset credential.helper + - git config --global credential.helper store + - echo "https://s.galanskiy:${GONETS}@dev.gossys.dev" > ~/.git-credentials + - git ls-remote origin + - git fetch --all + - git checkout develop - git commit --allow-empty -m "Тестовый коммит" - - git push origin develop + - git push -u origin develop \ No newline at end of file From 68a0ef4f21c15efc44d0c28745829bad840659af Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 12:26:49 +0500 Subject: [PATCH 55/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 02cd1ec..5c65595 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -16,10 +16,6 @@ steps: - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" - git remote -v - - rm -f ~/.git-credentials - - git config --global --unset credential.helper - - git config --global credential.helper store - - echo "https://s.galanskiy:${GONETS}@dev.gossys.dev" > ~/.git-credentials - git ls-remote origin - git fetch --all - git checkout develop From a0e40aef13a0febe89da003b5b082da9f226d9eb Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 14:33:20 +0500 Subject: [PATCH 56/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 5c65595..8fa8bf7 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -6,16 +6,15 @@ steps: checkout: image: debian:latest environment: - GONETS: - from_secret: GONETS commands: - apt update - apt install -y git git-lfs - git lfs install - - echo $${GONETS} + - echo "Тест: статический токен используется" - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" - git remote -v + - git remote set-url origin https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git - git ls-remote origin - git fetch --all - git checkout develop From 5494512d610bad8299843327ef5f290a85e5be90 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 14:33:37 +0500 Subject: [PATCH 57/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 8fa8bf7..8f1531d 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -10,7 +10,6 @@ steps: - apt update - apt install -y git git-lfs - git lfs install - - echo "Тест: статический токен используется" - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" - git remote -v From 653991b5cecda949488148efe226342085610fbc Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 14:35:24 +0500 Subject: [PATCH 58/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 125 ++++++++++++++++++++++++++++++++++-- 1 file changed, 120 insertions(+), 5 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 8f1531d..6230eac 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -6,16 +6,131 @@ steps: checkout: image: debian:latest environment: + GONETS: + from_secret: GONETS commands: + # ПОДГОТОВКА ГИТА И КЛОНИРОВАНИЕ GONETS - apt update - apt install -y git git-lfs - git lfs install + + # УСТАНОВКА НЕОБХОДИМЫХ ЗАВИСИМОСТЕЙ НА СИСТЕМЕ + - apt update + - apt install -y python3 openssh-server tree libnss3 libnss3-dev libnspr4 libnspr4-dev libasound2 libasound2-dev python3.11-venv python3-pip python3-poetry nodejs npm debhelper devscripts build-essential fakeroot dh-make dpkg-dev cmake libgirepository1.0-dev gobject-introspection libcairo2-dev pkg-config python3-dev libdbus-1-dev + - python3 --version + - node -v + - npm -v + + # ПОДГОТОВКА СПИСКА PYTHON ЗАВИСИМОСТЕЙ GONETS + - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED + - rm -rf /root/.local/share/pypoetry + - rm -rf /root/.poetry + - rm -rf /usr/bin/poetry + - pip install pipx + - pipx ensurepath + - pipx install poetry + - echo 'export PATH="$HOME/.local/bin:$PATH"' >> /root/.bashrc + - . /root/.bashrc + - poetry --version + - cd SRV + - poetry env activate + - poetry add poetry-plugin-export + - poetry install + - poetry self update + - rm -f requirements.txt + - poetry run poetry export -f requirements.txt --output requirements.txt --without-hashes + + # ПОДГОТОВКА И СБОРКА FRONTEND ЧАСТИ GONETS + - pwd + - cd .. + - pwd + - cd FRONT/DEV + - pwd + - npm install + - npm run package + - cd dist/gonets-linux-x64/resources/app + - pwd + - npm run build + - sed -i 's#href="/assets/#href="./assets/#g' dist/index.html + - sed -i 's#src="/assets/#src="./assets/#g' dist/index.html + - cd ../../../../.. + - pwd + - rm -rf BUILD/* + - cp -r DEV/dist/gonets-linux-x64/* BUILD/ + - rm -rf DEV + + # ИНИЦИАЛИЗАЦИЯ DEBIAN КОНФИГУРАЦИЙ ДЛЯ СБОРКИ + - cd .. + - pwd + - cd .. + - pwd + - mv gonets gonets-0.1 + - cd gonets-0.1 + - pwd + - ls + - DEBEMAIL="devteam@gossys.dev" DEBFULLNAME="GOSSYS LLC" dh_make --single -y --createorig + - cd debian/ + - rm -f *.ex + - rm -f README.* + + # КЛОНИРОВАНИЕ НЕОБХОДИМЫХ ШАБЛОНОВ КОНФИГОВ ДЕБИАНА ДЛЯ СБОРКИ + - mkdir -p /woodpecker/src/dev.gossys.dev/s.galanskiy/templates + - git clone https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets-debian-template.git /woodpecker/src/dev.gossys.dev/s.galanskiy/templates + - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/changelog /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ + - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/control /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ + - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/copyright /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ + - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/install /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ + - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/postinst /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ + - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/postrm /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ + - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/rules /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ + + # СБОРКА ДЕБИАН ПАКЕТА + - cd .. + - pwd + - dpkg-buildpackage -us -uc -b + + # ИЗВЛЕЧЕНИЕ ВЕРСИИ ПАКЕТА ДЛЯ КОММИТА + - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) + - echo "VERSION=$VERSION" > version.env + + # КОММИТ И ТЕГ НА ВЕТКУ DEVELOP + - . ./version.env - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" - - git remote -v - - git remote set-url origin https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git - - git ls-remote origin - git fetch --all + - git branch -r + - git reset --hard + - git clean -fd - git checkout develop - - git commit --allow-empty -m "Тестовый коммит" - - git push -u origin develop \ No newline at end of file + - pwd + - git add . + - git commit -am "Релиз $VERSION" + - git tag -f "v$VERSION" + - git push "https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git" develop + - git push -f https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" + + release-upload: + image: curlimages/curl:latest + environment: + GONETS: + from_secret: GONETS + commands: + - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) + - TAG="v$VERSION" + - DEB_PATH="../gonets_${VERSION}_amd64.deb" + - | + curl -s -X POST "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases" \ + -H "Authorization: token ${FORGEJO_TOKEN}" \ + -H "Content-Type: application/json" \ + -d '{ + "tag_name": "'$TAG'", + "name": "Релиз '$TAG'", + "body": "Сборка .deb пакета для версии '$TAG'", + "draft": false, + "prerelease": true + }' || true + - | + curl -s -X POST \ + -H "Authorization: token ${GONETS}" \ + -F "attachment=@$DEB_PATH" \ + "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$TAG/assets" From c65eb18a2953b861d9a924021c790e04d2999f70 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 14:52:42 +0500 Subject: [PATCH 59/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 6230eac..eef470e 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -97,13 +97,10 @@ steps: - . ./version.env - git config user.name "s.galanskiy" - git config user.email "s.galanskiy@gossys.dev" - - git fetch --all + - git fetch --all --prune - git branch -r - - git reset --hard - - git clean -fd - git checkout develop - - pwd - - git add . + - git pull origin develop - git commit -am "Релиз $VERSION" - git tag -f "v$VERSION" - git push "https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git" develop From 05650ee5767b047fb7c0d016d525f49a321ba976 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 15:14:45 +0500 Subject: [PATCH 60/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index eef470e..3a22f1a 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -99,25 +99,21 @@ steps: - git config user.email "s.galanskiy@gossys.dev" - git fetch --all --prune - git branch -r - - git checkout develop - - git pull origin develop + - git checkout -b "release/$VERSION" - git commit -am "Релиз $VERSION" - git tag -f "v$VERSION" - - git push "https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git" develop + - git push "https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git" "release/$VERSION" - git push -f https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" release-upload: image: curlimages/curl:latest - environment: - GONETS: - from_secret: GONETS commands: - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) - TAG="v$VERSION" - DEB_PATH="../gonets_${VERSION}_amd64.deb" - | curl -s -X POST "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases" \ - -H "Authorization: token ${FORGEJO_TOKEN}" \ + -H "Authorization: token b4785198d18200dfed812dc4299575f736255bd7" \ -H "Content-Type: application/json" \ -d '{ "tag_name": "'$TAG'", @@ -128,6 +124,6 @@ steps: }' || true - | curl -s -X POST \ - -H "Authorization: token ${GONETS}" \ + -H "Authorization: token b4785198d18200dfed812dc4299575f736255bd7" \ -F "attachment=@$DEB_PATH" \ "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$TAG/assets" From 59d4103dba1050548375ba5ebbeb86a7b853b0c5 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 15:33:19 +0500 Subject: [PATCH 61/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 3a22f1a..d9011e9 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -105,10 +105,8 @@ steps: - git push "https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git" "release/$VERSION" - git push -f https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" - release-upload: - image: curlimages/curl:latest - commands: - - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) + # СОЗДАНИЕ И ЗАГРУЗКА РЕЛИЗА ЧЕРЕЗ API + - VERSION=$(cat version.env | grep VERSION | cut -d'=' -f2) - TAG="v$VERSION" - DEB_PATH="../gonets_${VERSION}_amd64.deb" - | @@ -126,4 +124,4 @@ steps: curl -s -X POST \ -H "Authorization: token b4785198d18200dfed812dc4299575f736255bd7" \ -F "attachment=@$DEB_PATH" \ - "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$TAG/assets" + "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$TAG/assets" \ No newline at end of file From f4bd09d735aad123292d36284c4f65187f89935c Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 16:11:26 +0500 Subject: [PATCH 62/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index d9011e9..d6f6a21 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -106,9 +106,12 @@ steps: - git push -f https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" # СОЗДАНИЕ И ЗАГРУЗКА РЕЛИЗА ЧЕРЕЗ API - - VERSION=$(cat version.env | grep VERSION | cut -d'=' -f2) + - . ./version.env + - echo "Текущая версия: $VERSION" - TAG="v$VERSION" - DEB_PATH="../gonets_${VERSION}_amd64.deb" + - echo "Путь к файлу: $DEB_PATH" + - ls -l "$DEB_PATH" || echo "Файл не найден по пути: $DEB_PATH" - | curl -s -X POST "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases" \ -H "Authorization: token b4785198d18200dfed812dc4299575f736255bd7" \ @@ -124,4 +127,4 @@ steps: curl -s -X POST \ -H "Authorization: token b4785198d18200dfed812dc4299575f736255bd7" \ -F "attachment=@$DEB_PATH" \ - "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$TAG/assets" \ No newline at end of file + "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$TAG/assets" || echo "Ошибка загрузки файла" \ No newline at end of file From 8cf457fa2ed3e863b0a48c3e04cbf697edf5614d Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 16:11:47 +0500 Subject: [PATCH 63/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index d6f6a21..3b5aa79 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -107,7 +107,6 @@ steps: # СОЗДАНИЕ И ЗАГРУЗКА РЕЛИЗА ЧЕРЕЗ API - . ./version.env - - echo "Текущая версия: $VERSION" - TAG="v$VERSION" - DEB_PATH="../gonets_${VERSION}_amd64.deb" - echo "Путь к файлу: $DEB_PATH" From 631139e6298c2909b7229f6619916c1a8df64163 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 16:12:01 +0500 Subject: [PATCH 64/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 3b5aa79..b5c14c2 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -109,7 +109,6 @@ steps: - . ./version.env - TAG="v$VERSION" - DEB_PATH="../gonets_${VERSION}_amd64.deb" - - echo "Путь к файлу: $DEB_PATH" - ls -l "$DEB_PATH" || echo "Файл не найден по пути: $DEB_PATH" - | curl -s -X POST "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases" \ From 7bf34f498a6580f2adf553997a8b00a4ada72e6b Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 16:12:17 +0500 Subject: [PATCH 65/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index b5c14c2..b518907 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -109,7 +109,6 @@ steps: - . ./version.env - TAG="v$VERSION" - DEB_PATH="../gonets_${VERSION}_amd64.deb" - - ls -l "$DEB_PATH" || echo "Файл не найден по пути: $DEB_PATH" - | curl -s -X POST "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases" \ -H "Authorization: token b4785198d18200dfed812dc4299575f736255bd7" \ From 8c957b0fe36bfd5a2418dd9fb4842af839745d19 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 17:26:14 +0500 Subject: [PATCH 66/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index b518907..8fe64e5 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -16,7 +16,7 @@ steps: # УСТАНОВКА НЕОБХОДИМЫХ ЗАВИСИМОСТЕЙ НА СИСТЕМЕ - apt update - - apt install -y python3 openssh-server tree libnss3 libnss3-dev libnspr4 libnspr4-dev libasound2 libasound2-dev python3.11-venv python3-pip python3-poetry nodejs npm debhelper devscripts build-essential fakeroot dh-make dpkg-dev cmake libgirepository1.0-dev gobject-introspection libcairo2-dev pkg-config python3-dev libdbus-1-dev + - apt install -y python3 curl findutils grep sed openssh-server tree libnss3 libnss3-dev libnspr4 libnspr4-dev libasound2 libasound2-dev python3.11-venv python3-pip python3-poetry nodejs npm debhelper devscripts build-essential fakeroot dh-make dpkg-dev cmake libgirepository1.0-dev gobject-introspection libcairo2-dev pkg-config python3-dev libdbus-1-dev - python3 --version - node -v - npm -v @@ -106,22 +106,26 @@ steps: - git push -f https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" # СОЗДАНИЕ И ЗАГРУЗКА РЕЛИЗА ЧЕРЕЗ API + - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) + - echo "VERSION=$VERSION" > version.env + - . ./version.env - TAG="v$VERSION" - - DEB_PATH="../gonets_${VERSION}_amd64.deb" - - | - curl -s -X POST "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases" \ + + - DEB_PATH=$(find .. -maxdepth 1 -type f -name "gonets_${VERSION}_*.deb" | head -n 1) + + - if [ ! -f "$DEB_PATH" ]; then echo "❌ .deb файл не найден по пути: $DEB_PATH"; exit 1; fi + + - RELEASE_JSON=$(curl -s -X POST "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases" \ -H "Authorization: token b4785198d18200dfed812dc4299575f736255bd7" \ -H "Content-Type: application/json" \ - -d '{ - "tag_name": "'$TAG'", - "name": "Релиз '$TAG'", - "body": "Сборка .deb пакета для версии '$TAG'", - "draft": false, - "prerelease": true - }' || true - - | - curl -s -X POST \ + -d "{\"tag_name\": \"$TAG\", \"name\": \"Релиз $TAG\", \"body\": \"Сборка .deb пакета для версии $TAG\", \"draft\": false, \"prerelease\": true}") + + - RELEASE_ID=$(echo "$RELEASE_JSON" | grep '"id":' | head -n1 | sed 's/[^0-9]*\([0-9]*\).*/\1/') + + - if [ -z "$RELEASE_ID" ]; then echo "❌ Не удалось получить ID релиза из ответа: $RELEASE_JSON"; exit 1; fi + + - curl -s -X POST \ -H "Authorization: token b4785198d18200dfed812dc4299575f736255bd7" \ -F "attachment=@$DEB_PATH" \ - "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$TAG/assets" || echo "Ошибка загрузки файла" \ No newline at end of file + "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$RELEASE_ID/assets" || echo "❌ Ошибка загрузки файла" \ No newline at end of file From 5cd0a70aa1d899ec02dfc0ea0dca91c459919fe3 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 17:27:49 +0500 Subject: [PATCH 67/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 8fe64e5..d62dfcf 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -106,26 +106,40 @@ steps: - git push -f https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" # СОЗДАНИЕ И ЗАГРУЗКА РЕЛИЗА ЧЕРЕЗ API - - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) - - echo "VERSION=$VERSION" > version.env + VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) + echo "VERSION=$VERSION" > version.env - - . ./version.env - - TAG="v$VERSION" + # Задать переменные + . ./version.env + TAG="v$VERSION" - - DEB_PATH=$(find .. -maxdepth 1 -type f -name "gonets_${VERSION}_*.deb" | head -n 1) + # Найти .deb файл в родительской директории + DEB_PATH=$(find .. -maxdepth 1 -type f -name "gonets_${VERSION}_*.deb" | head -n 1) - - if [ ! -f "$DEB_PATH" ]; then echo "❌ .deb файл не найден по пути: $DEB_PATH"; exit 1; fi + # Проверка наличия файла + if [ ! -f "$DEB_PATH" ]; then + echo "❌ .deb файл не найден по пути: $DEB_PATH" + exit 1 + fi - - RELEASE_JSON=$(curl -s -X POST "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases" \ + # Создание релиза + RELEASE_JSON=$(curl -s -X POST "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases" \ -H "Authorization: token b4785198d18200dfed812dc4299575f736255bd7" \ -H "Content-Type: application/json" \ -d "{\"tag_name\": \"$TAG\", \"name\": \"Релиз $TAG\", \"body\": \"Сборка .deb пакета для версии $TAG\", \"draft\": false, \"prerelease\": true}") - - RELEASE_ID=$(echo "$RELEASE_JSON" | grep '"id":' | head -n1 | sed 's/[^0-9]*\([0-9]*\).*/\1/') + # Извлечение ID релиза + RELEASE_ID=$(echo "$RELEASE_JSON" | grep '"id":' | head -n1 | sed 's/[^0-9]*\([0-9]*\).*/\1/') - - if [ -z "$RELEASE_ID" ]; then echo "❌ Не удалось получить ID релиза из ответа: $RELEASE_JSON"; exit 1; fi + # Проверка ID + if [ -z "$RELEASE_ID" ]; then + echo "❌ Не удалось получить ID релиза из ответа:" + echo "$RELEASE_JSON" + exit 1 + fi - - curl -s -X POST \ + # Загрузка .deb файла как asset + curl -s -X POST \ -H "Authorization: token b4785198d18200dfed812dc4299575f736255bd7" \ -F "attachment=@$DEB_PATH" \ "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$RELEASE_ID/assets" || echo "❌ Ошибка загрузки файла" \ No newline at end of file From 95f226bb7c487c05450e806f3b1883a1f0d0c6c2 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 17:28:52 +0500 Subject: [PATCH 68/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index d62dfcf..adb4cdf 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -106,6 +106,7 @@ steps: - git push -f https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" # СОЗДАНИЕ И ЗАГРУЗКА РЕЛИЗА ЧЕРЕЗ API + - | VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) echo "VERSION=$VERSION" > version.env From c4f0a695dc2436f35846b8de5f66411fabf3d243 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 17:50:08 +0500 Subject: [PATCH 69/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index adb4cdf..6a4f719 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -1,7 +1,3 @@ -when: - event: [push, tag] - branch: main - steps: checkout: image: debian:latest @@ -115,7 +111,7 @@ steps: TAG="v$VERSION" # Найти .deb файл в родительской директории - DEB_PATH=$(find .. -maxdepth 1 -type f -name "gonets_${VERSION}_*.deb" | head -n 1) + DEB_PATH=$(find .. -maxdepth 1 -type f -name "gonets_${VERSION}_amd64.deb" | head -n 1) # Проверка наличия файла if [ ! -f "$DEB_PATH" ]; then From 3bb3eb19c86db2ccffdbc8a15598e2d2763cf78a Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Wed, 2 Jul 2025 18:05:46 +0500 Subject: [PATCH 70/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 6a4f719..75a391d 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -110,32 +110,26 @@ steps: . ./version.env TAG="v$VERSION" - # Найти .deb файл в родительской директории - DEB_PATH=$(find .. -maxdepth 1 -type f -name "gonets_${VERSION}_amd64.deb" | head -n 1) + DEB_PATH=$(find .. -maxdepth 1 -type f -name "gonets_*_amd64.deb" | head -n 1) - # Проверка наличия файла if [ ! -f "$DEB_PATH" ]; then echo "❌ .deb файл не найден по пути: $DEB_PATH" exit 1 fi - # Создание релиза RELEASE_JSON=$(curl -s -X POST "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases" \ -H "Authorization: token b4785198d18200dfed812dc4299575f736255bd7" \ -H "Content-Type: application/json" \ -d "{\"tag_name\": \"$TAG\", \"name\": \"Релиз $TAG\", \"body\": \"Сборка .deb пакета для версии $TAG\", \"draft\": false, \"prerelease\": true}") - # Извлечение ID релиза RELEASE_ID=$(echo "$RELEASE_JSON" | grep '"id":' | head -n1 | sed 's/[^0-9]*\([0-9]*\).*/\1/') - # Проверка ID if [ -z "$RELEASE_ID" ]; then echo "❌ Не удалось получить ID релиза из ответа:" echo "$RELEASE_JSON" exit 1 fi - # Загрузка .deb файла как asset curl -s -X POST \ -H "Authorization: token b4785198d18200dfed812dc4299575f736255bd7" \ -F "attachment=@$DEB_PATH" \ From 8043eef048c9df378c3694ef2b1a4569b69209c5 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Thu, 3 Jul 2025 10:46:56 +0500 Subject: [PATCH 71/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 75a391d..d37e70f 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -1,3 +1,6 @@ +when: + event: manual + steps: checkout: image: debian:latest From 0af7608d0c16b6d0b3bd3d82fbf96124175eb81f Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Thu, 3 Jul 2025 11:13:10 +0500 Subject: [PATCH 72/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index d37e70f..faa1864 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -116,7 +116,7 @@ steps: DEB_PATH=$(find .. -maxdepth 1 -type f -name "gonets_*_amd64.deb" | head -n 1) if [ ! -f "$DEB_PATH" ]; then - echo "❌ .deb файл не найден по пути: $DEB_PATH" + echo ".deb файл не найден по пути: $DEB_PATH" exit 1 fi @@ -128,7 +128,7 @@ steps: RELEASE_ID=$(echo "$RELEASE_JSON" | grep '"id":' | head -n1 | sed 's/[^0-9]*\([0-9]*\).*/\1/') if [ -z "$RELEASE_ID" ]; then - echo "❌ Не удалось получить ID релиза из ответа:" + echo "Не удалось получить ID релиза из ответа:" echo "$RELEASE_JSON" exit 1 fi @@ -136,4 +136,4 @@ steps: curl -s -X POST \ -H "Authorization: token b4785198d18200dfed812dc4299575f736255bd7" \ -F "attachment=@$DEB_PATH" \ - "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$RELEASE_ID/assets" || echo "❌ Ошибка загрузки файла" \ No newline at end of file + "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$RELEASE_ID/assets" || echo "Ошибка загрузки файла" \ No newline at end of file From 47d8b2125b013fec61f3f56083b98363a7babda7 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Thu, 3 Jul 2025 11:14:00 +0500 Subject: [PATCH 73/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit РАБОЧИЙ КОНФИГ ДЛЯ CI/CD GONETS --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index faa1864..4faf67d 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -116,7 +116,7 @@ steps: DEB_PATH=$(find .. -maxdepth 1 -type f -name "gonets_*_amd64.deb" | head -n 1) if [ ! -f "$DEB_PATH" ]; then - echo ".deb файл не найден по пути: $DEB_PATH" + echo " .deb файл не найден по пути: $DEB_PATH" exit 1 fi From 936fc6ba2db1da0f3f83a4a4dfb27f646ddde67d Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Thu, 3 Jul 2025 11:14:32 +0500 Subject: [PATCH 74/79] =?UTF-8?q?=D0=A0=D0=90=D0=91=D0=9E=D0=A7=D0=98?= =?UTF-8?q?=D0=99=20=D0=9A=D0=9E=D0=9D=D0=A4=D0=98=D0=93=20=D0=94=D0=9B?= =?UTF-8?q?=D0=AF=20CI/CD=20GONETS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 4faf67d..faa1864 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -116,7 +116,7 @@ steps: DEB_PATH=$(find .. -maxdepth 1 -type f -name "gonets_*_amd64.deb" | head -n 1) if [ ! -f "$DEB_PATH" ]; then - echo " .deb файл не найден по пути: $DEB_PATH" + echo ".deb файл не найден по пути: $DEB_PATH" exit 1 fi From a7e7676897082d232c008fd90f3dfc87c0b228f5 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Thu, 3 Jul 2025 15:19:33 +0500 Subject: [PATCH 75/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 133 ++---------------------------------- 1 file changed, 5 insertions(+), 128 deletions(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index faa1864..d5db2cd 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -4,136 +4,13 @@ when: steps: checkout: image: debian:latest - environment: - GONETS: - from_secret: GONETS + secrets: [forgejo_token] commands: # ПОДГОТОВКА ГИТА И КЛОНИРОВАНИЕ GONETS - apt update - apt install -y git git-lfs - git lfs install - - # УСТАНОВКА НЕОБХОДИМЫХ ЗАВИСИМОСТЕЙ НА СИСТЕМЕ - - apt update - - apt install -y python3 curl findutils grep sed openssh-server tree libnss3 libnss3-dev libnspr4 libnspr4-dev libasound2 libasound2-dev python3.11-venv python3-pip python3-poetry nodejs npm debhelper devscripts build-essential fakeroot dh-make dpkg-dev cmake libgirepository1.0-dev gobject-introspection libcairo2-dev pkg-config python3-dev libdbus-1-dev - - python3 --version - - node -v - - npm -v - - # ПОДГОТОВКА СПИСКА PYTHON ЗАВИСИМОСТЕЙ GONETS - - rm -rf /usr/lib/python3.11/EXTERNALLY-MANAGED - - rm -rf /root/.local/share/pypoetry - - rm -rf /root/.poetry - - rm -rf /usr/bin/poetry - - pip install pipx - - pipx ensurepath - - pipx install poetry - - echo 'export PATH="$HOME/.local/bin:$PATH"' >> /root/.bashrc - - . /root/.bashrc - - poetry --version - - cd SRV - - poetry env activate - - poetry add poetry-plugin-export - - poetry install - - poetry self update - - rm -f requirements.txt - - poetry run poetry export -f requirements.txt --output requirements.txt --without-hashes - - # ПОДГОТОВКА И СБОРКА FRONTEND ЧАСТИ GONETS - - pwd - - cd .. - - pwd - - cd FRONT/DEV - - pwd - - npm install - - npm run package - - cd dist/gonets-linux-x64/resources/app - - pwd - - npm run build - - sed -i 's#href="/assets/#href="./assets/#g' dist/index.html - - sed -i 's#src="/assets/#src="./assets/#g' dist/index.html - - cd ../../../../.. - - pwd - - rm -rf BUILD/* - - cp -r DEV/dist/gonets-linux-x64/* BUILD/ - - rm -rf DEV - - # ИНИЦИАЛИЗАЦИЯ DEBIAN КОНФИГУРАЦИЙ ДЛЯ СБОРКИ - - cd .. - - pwd - - cd .. - - pwd - - mv gonets gonets-0.1 - - cd gonets-0.1 - - pwd - - ls - - DEBEMAIL="devteam@gossys.dev" DEBFULLNAME="GOSSYS LLC" dh_make --single -y --createorig - - cd debian/ - - rm -f *.ex - - rm -f README.* - - # КЛОНИРОВАНИЕ НЕОБХОДИМЫХ ШАБЛОНОВ КОНФИГОВ ДЕБИАНА ДЛЯ СБОРКИ - - mkdir -p /woodpecker/src/dev.gossys.dev/s.galanskiy/templates - - git clone https://s.galanskiy:${GONETS}@dev.gossys.dev/s.galanskiy/gonets-debian-template.git /woodpecker/src/dev.gossys.dev/s.galanskiy/templates - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/changelog /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/control /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/copyright /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/install /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/postinst /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/postrm /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - mv /woodpecker/src/dev.gossys.dev/s.galanskiy/templates/rules /woodpecker/src/dev.gossys.dev/s.galanskiy/gonets-0.1/debian/ - - # СБОРКА ДЕБИАН ПАКЕТА - - cd .. - - pwd - - dpkg-buildpackage -us -uc -b - - # ИЗВЛЕЧЕНИЕ ВЕРСИИ ПАКЕТА ДЛЯ КОММИТА - - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) - - echo "VERSION=$VERSION" > version.env - - # КОММИТ И ТЕГ НА ВЕТКУ DEVELOP - - . ./version.env - - git config user.name "s.galanskiy" - - git config user.email "s.galanskiy@gossys.dev" - - git fetch --all --prune - - git branch -r - - git checkout -b "release/$VERSION" - - git commit -am "Релиз $VERSION" - - git tag -f "v$VERSION" - - git push "https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git" "release/$VERSION" - - git push -f https://s.galanskiy:b4785198d18200dfed812dc4299575f736255bd7@dev.gossys.dev/s.galanskiy/gonets.git "v$VERSION" - - # СОЗДАНИЕ И ЗАГРУЗКА РЕЛИЗА ЧЕРЕЗ API - - | - VERSION=$(dpkg-parsechangelog -l./debian/changelog --show-field Version) - echo "VERSION=$VERSION" > version.env - - # Задать переменные - . ./version.env - TAG="v$VERSION" - - DEB_PATH=$(find .. -maxdepth 1 -type f -name "gonets_*_amd64.deb" | head -n 1) - - if [ ! -f "$DEB_PATH" ]; then - echo ".deb файл не найден по пути: $DEB_PATH" - exit 1 - fi - - RELEASE_JSON=$(curl -s -X POST "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases" \ - -H "Authorization: token b4785198d18200dfed812dc4299575f736255bd7" \ - -H "Content-Type: application/json" \ - -d "{\"tag_name\": \"$TAG\", \"name\": \"Релиз $TAG\", \"body\": \"Сборка .deb пакета для версии $TAG\", \"draft\": false, \"prerelease\": true}") - - RELEASE_ID=$(echo "$RELEASE_JSON" | grep '"id":' | head -n1 | sed 's/[^0-9]*\([0-9]*\).*/\1/') - - if [ -z "$RELEASE_ID" ]; then - echo "Не удалось получить ID релиза из ответа:" - echo "$RELEASE_JSON" - exit 1 - fi - - curl -s -X POST \ - -H "Authorization: token b4785198d18200dfed812dc4299575f736255bd7" \ - -F "attachment=@$DEB_PATH" \ - "https://dev.gossys.dev/api/v1/repos/s.galanskiy/gonets/releases/$RELEASE_ID/assets" || echo "Ошибка загрузки файла" \ No newline at end of file + - touch file + - git add . + - git commit -m "commit" + - git push https://$forgejo_token@dev.gossys.dev/s.galanskiy/gonets.git \ No newline at end of file From d7656bd2616df7f913908f0bb90737521082fb7b Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Thu, 3 Jul 2025 15:20:40 +0500 Subject: [PATCH 76/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index d5db2cd..22a8f18 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -4,7 +4,9 @@ when: steps: checkout: image: debian:latest - secrets: [forgejo_token] + environment: + FORGEJO_TOKEN: + from_secret: forgejo_token commands: # ПОДГОТОВКА ГИТА И КЛОНИРОВАНИЕ GONETS - apt update From 98cfd6da943af9327c27b8ea15cc5c3f0ae588e8 Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Thu, 3 Jul 2025 15:21:56 +0500 Subject: [PATCH 77/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 22a8f18..5757eca 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -12,6 +12,8 @@ steps: - apt update - apt install -y git git-lfs - git lfs install + - git config --global user.email "s.galanskiy@gossys.dev" + - git config --global user.name "s.galanskiy" - touch file - git add . - git commit -m "commit" From 0ee3d21d7cf8d0f1ff58a03b55cc13669bbeb62d Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Thu, 3 Jul 2025 15:25:38 +0500 Subject: [PATCH 78/79] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=B8?= =?UTF-8?q?=D1=82=D1=8C=20.woodpecker/.woodpecker.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .woodpecker/.woodpecker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/.woodpecker.yml b/.woodpecker/.woodpecker.yml index 5757eca..94ea84d 100644 --- a/.woodpecker/.woodpecker.yml +++ b/.woodpecker/.woodpecker.yml @@ -17,4 +17,4 @@ steps: - touch file - git add . - git commit -m "commit" - - git push https://$forgejo_token@dev.gossys.dev/s.galanskiy/gonets.git \ No newline at end of file + - git push https://$FORGEJO_TOKEN@dev.gossys.dev/s.galanskiy/gonets.git \ No newline at end of file From c4546fec60449c12b77b1efb99c321a93b493bcf Mon Sep 17 00:00:00 2001 From: "s.galanskiy" Date: Thu, 3 Jul 2025 11:02:52 +0000 Subject: [PATCH 79/79] commit --- file | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 file diff --git a/file b/file new file mode 100644 index 0000000..e69de29