From 851e34b1100dc11c237ebfef170c56bb0298abaa Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 12 Jun 2024 17:21:35 +0300 Subject: [PATCH 01/20] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=82=D0=BE=D0=BA=D0=B5=D0=BD=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?update=5Fchangelog.yml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/update_changelog.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index 0a9a1ace151..3e52976ff46 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -13,22 +13,24 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - + - name: Set up Python uses: actions/setup-python@v2 with: python-version: '3.x' - + - name: Install Dependencies run: pip install pyyaml - + - name: Extract Changelog from PR run: python3 Tools/update_changelog.py "${{ github.event.pull_request.body }}" "Resources/Changelog/ChangelogSunrise.yml" - + - name: Commit and Push Changes + env: + GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} run: | git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' git add Resources/Changelog/ChangelogSunrise.yml git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}' - git push \ No newline at end of file + git push https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master \ No newline at end of file From 1b43f3111f36b5b6e2f43e5ed1f01bf690eb3e5a Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 12 Jun 2024 17:25:59 +0300 Subject: [PATCH 02/20] =?UTF-8?q?=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=B8=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml index ad7e3693545..e33c18f27bf 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml @@ -16,3 +16,4 @@ roles: - CentCommOperator primary: false + From 8b391a058489d557ac8916b4ed03b69d15ffcf83 Mon Sep 17 00:00:00 2001 From: Vigers Ray <60344369+VigersRay@users.noreply.github.com> Date: Wed, 12 Jun 2024 17:26:45 +0300 Subject: [PATCH 03/20] =?UTF-8?q?=D0=A2=D0=B5=D1=81=D1=82=20=D0=B0=D0=B2?= =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=B5=D0=B9=D0=BD=D0=B6=D0=BB=D0=BE=D0=B3?= =?UTF-8?q?=D0=B0=20(#69)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml index ad7e3693545..e33c18f27bf 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml @@ -16,3 +16,4 @@ roles: - CentCommOperator primary: false + From b6f16ddbb112b30a05d325bf9e26cdb206d2d4f3 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 12 Jun 2024 17:30:37 +0300 Subject: [PATCH 04/20] =?UTF-8?q?=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=202?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml index e33c18f27bf..ad7e3693545 100644 --- a/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/_Sunrise/Roles/Jobs/departments.yml @@ -16,4 +16,3 @@ roles: - CentCommOperator primary: false - From 9b8c40d6cc0dacf75f87b678e1aae950af9d1fe8 Mon Sep 17 00:00:00 2001 From: Vigers Ray <60344369+VigersRay@users.noreply.github.com> Date: Wed, 12 Jun 2024 17:32:54 +0300 Subject: [PATCH 05/20] Test changelog (#70) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * пустой комит * пустой коммит 2 From fad83e56ebbdba405a0c9d58caa55e8bbf6b4939 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 12 Jun 2024 17:35:00 +0300 Subject: [PATCH 06/20] update update_changelog.yml --- .github/workflows/update_changelog.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index 3e52976ff46..35445f6cd75 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -13,18 +13,18 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - + - name: Set up Python uses: actions/setup-python@v2 with: python-version: '3.x' - + - name: Install Dependencies run: pip install pyyaml - + - name: Extract Changelog from PR run: python3 Tools/update_changelog.py "${{ github.event.pull_request.body }}" "Resources/Changelog/ChangelogSunrise.yml" - + - name: Commit and Push Changes env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} @@ -33,4 +33,4 @@ jobs: git config --global user.email 'github-actions[bot]@users.noreply.github.com' git add Resources/Changelog/ChangelogSunrise.yml git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}' - git push https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master \ No newline at end of file + git push https://${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master From 195b8f24a7d5f03dbbe66d335a3659305df2d6b3 Mon Sep 17 00:00:00 2001 From: Vigers Ray <60344369+VigersRay@users.noreply.github.com> Date: Wed, 12 Jun 2024 17:35:49 +0300 Subject: [PATCH 07/20] Test changelog (#71) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * пустой комит * пустой коммит 2 * update update_changelog.yml --- .github/workflows/update_changelog.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index 3e52976ff46..35445f6cd75 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -13,18 +13,18 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - + - name: Set up Python uses: actions/setup-python@v2 with: python-version: '3.x' - + - name: Install Dependencies run: pip install pyyaml - + - name: Extract Changelog from PR run: python3 Tools/update_changelog.py "${{ github.event.pull_request.body }}" "Resources/Changelog/ChangelogSunrise.yml" - + - name: Commit and Push Changes env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} @@ -33,4 +33,4 @@ jobs: git config --global user.email 'github-actions[bot]@users.noreply.github.com' git add Resources/Changelog/ChangelogSunrise.yml git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}' - git push https://x-access-token:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master \ No newline at end of file + git push https://${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master From 4521fa2da50ac60f493c3fe586f2d012724c4c93 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 12 Jun 2024 17:42:26 +0300 Subject: [PATCH 08/20] update update_changelog.yml --- .github/workflows/update_changelog.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index 35445f6cd75..019e4b277e7 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -13,18 +13,18 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - + - name: Set up Python uses: actions/setup-python@v2 with: python-version: '3.x' - + - name: Install Dependencies run: pip install pyyaml - + - name: Extract Changelog from PR run: python3 Tools/update_changelog.py "${{ github.event.pull_request.body }}" "Resources/Changelog/ChangelogSunrise.yml" - + - name: Commit and Push Changes env: GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} @@ -33,4 +33,4 @@ jobs: git config --global user.email 'github-actions[bot]@users.noreply.github.com' git add Resources/Changelog/ChangelogSunrise.yml git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}' - git push https://${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master + git push https://VigersRay:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master From a29841026085c36984f6a10ce2586a6433ff9e45 Mon Sep 17 00:00:00 2001 From: Vigers Ray <60344369+VigersRay@users.noreply.github.com> Date: Wed, 12 Jun 2024 17:44:20 +0300 Subject: [PATCH 09/20] Test changelog (#72) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * пустой комит * пустой коммит 2 * update update_changelog.yml * update update_changelog.yml --- .github/workflows/update_changelog.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index 35445f6cd75..ae0206c3736 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - + - name: Set up Python uses: actions/setup-python@v2 with: @@ -33,4 +33,4 @@ jobs: git config --global user.email 'github-actions[bot]@users.noreply.github.com' git add Resources/Changelog/ChangelogSunrise.yml git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}' - git push https://${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master + git push https://VigersRay:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master From 8064920bb865c48e5a35813477ed65af0c515548 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 12 Jun 2024 17:49:49 +0300 Subject: [PATCH 10/20] update update_changelog.yml --- .github/workflows/update_changelog.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index ae0206c3736..312b0903f73 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -24,13 +24,13 @@ jobs: - name: Extract Changelog from PR run: python3 Tools/update_changelog.py "${{ github.event.pull_request.body }}" "Resources/Changelog/ChangelogSunrise.yml" - + - name: Commit and Push Changes env: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' git add Resources/Changelog/ChangelogSunrise.yml git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}' - git push https://VigersRay:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master + git push https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master From e228ae176a8bad7ef802e7c949a2217ff34cf014 Mon Sep 17 00:00:00 2001 From: Vigers Ray <60344369+VigersRay@users.noreply.github.com> Date: Wed, 12 Jun 2024 17:52:03 +0300 Subject: [PATCH 11/20] Test changelog (#73) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * пустой комит * пустой коммит 2 * update update_changelog.yml * update update_changelog.yml * update update_changelog.yml --- .github/workflows/update_changelog.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index ae0206c3736..312b0903f73 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -24,13 +24,13 @@ jobs: - name: Extract Changelog from PR run: python3 Tools/update_changelog.py "${{ github.event.pull_request.body }}" "Resources/Changelog/ChangelogSunrise.yml" - + - name: Commit and Push Changes env: - GITHUB_TOKEN: ${{ secrets.GH_TOKEN }} + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | git config --global user.name 'github-actions[bot]' git config --global user.email 'github-actions[bot]@users.noreply.github.com' git add Resources/Changelog/ChangelogSunrise.yml git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}' - git push https://VigersRay:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master + git push https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master From d09940908ec7f082ec1aba158e9d7506b3a7bde5 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 12 Jun 2024 18:06:54 +0300 Subject: [PATCH 12/20] =?UTF-8?q?=D0=BF=D0=BE=D0=BF=D1=80=D0=BE=D0=B1?= =?UTF-8?q?=D1=83=D0=B5=D0=BC=20=D1=82=D0=B0=D0=BA...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/update_changelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index 312b0903f73..1e136a90542 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - + - name: Set up Python uses: actions/setup-python@v2 with: @@ -24,13 +24,14 @@ jobs: - name: Extract Changelog from PR run: python3 Tools/update_changelog.py "${{ github.event.pull_request.body }}" "Resources/Changelog/ChangelogSunrise.yml" - + - name: Commit and Push Changes env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} run: | - git config --global user.name 'github-actions[bot]' - git config --global user.email 'github-actions[bot]@users.noreply.github.com' + git config --global user.name 'VigersRay' + git config --global user.email 'VigersRay@gmail.com' + git checkout -b update-changelog-${{ github.run_id }} git add Resources/Changelog/ChangelogSunrise.yml git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}' - git push https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master + git push https://VigersRay:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:update-changelog-${{ github.run_id }} \ No newline at end of file From 11b25288df73d861af4120f935d49e5e6674ba8f Mon Sep 17 00:00:00 2001 From: Vigers Ray <60344369+VigersRay@users.noreply.github.com> Date: Wed, 12 Jun 2024 18:10:10 +0300 Subject: [PATCH 13/20] Test changelog (#74) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * пустой комит * пустой коммит 2 * update update_changelog.yml * update update_changelog.yml * update update_changelog.yml * попробуем так... --- .github/workflows/update_changelog.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index 312b0903f73..1e136a90542 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -13,7 +13,7 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - + - name: Set up Python uses: actions/setup-python@v2 with: @@ -24,13 +24,14 @@ jobs: - name: Extract Changelog from PR run: python3 Tools/update_changelog.py "${{ github.event.pull_request.body }}" "Resources/Changelog/ChangelogSunrise.yml" - + - name: Commit and Push Changes env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} run: | - git config --global user.name 'github-actions[bot]' - git config --global user.email 'github-actions[bot]@users.noreply.github.com' + git config --global user.name 'VigersRay' + git config --global user.email 'VigersRay@gmail.com' + git checkout -b update-changelog-${{ github.run_id }} git add Resources/Changelog/ChangelogSunrise.yml git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}' - git push https://${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master + git push https://VigersRay:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:update-changelog-${{ github.run_id }} \ No newline at end of file From 48a40aa359f105dfa0475ad8feefb1238e1f23c4 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 12 Jun 2024 18:13:42 +0300 Subject: [PATCH 14/20] =?UTF-8?q?=D0=BA=D0=B0=D0=BA=20=D0=B6=D0=B5=20?= =?UTF-8?q?=D1=8F=20=D0=B7=D0=B0=D0=B5=D0=B1=D0=B0=D0=BB=D1=81=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/update_changelog.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index 1e136a90542..097fb07cdf2 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -31,7 +31,6 @@ jobs: run: | git config --global user.name 'VigersRay' git config --global user.email 'VigersRay@gmail.com' - git checkout -b update-changelog-${{ github.run_id }} git add Resources/Changelog/ChangelogSunrise.yml git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}' git push https://VigersRay:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:update-changelog-${{ github.run_id }} \ No newline at end of file From a8536806d3f9aa8fb0483e29607a802ffa58ccc1 Mon Sep 17 00:00:00 2001 From: Vigers Ray <60344369+VigersRay@users.noreply.github.com> Date: Wed, 12 Jun 2024 18:15:26 +0300 Subject: [PATCH 15/20] Test changelog (#75) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * пустой комит * пустой коммит 2 * update update_changelog.yml * update update_changelog.yml * update update_changelog.yml * попробуем так... * как же я заебался --- .github/workflows/update_changelog.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index 1e136a90542..097fb07cdf2 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -31,7 +31,6 @@ jobs: run: | git config --global user.name 'VigersRay' git config --global user.email 'VigersRay@gmail.com' - git checkout -b update-changelog-${{ github.run_id }} git add Resources/Changelog/ChangelogSunrise.yml git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}' git push https://VigersRay:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:update-changelog-${{ github.run_id }} \ No newline at end of file From c9f897687816cf5b522ad8e5ef1546bb7bc37c81 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 12 Jun 2024 18:16:43 +0300 Subject: [PATCH 16/20] =?UTF-8?q?=D0=94=D0=90=20=D0=A1=D0=A3=D0=9A=D0=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/update_changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index 097fb07cdf2..2bbdfd03906 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -33,4 +33,4 @@ jobs: git config --global user.email 'VigersRay@gmail.com' git add Resources/Changelog/ChangelogSunrise.yml git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}' - git push https://VigersRay:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:update-changelog-${{ github.run_id }} \ No newline at end of file + git push https://VigersRay:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master \ No newline at end of file From 0246e35fe896e67b73e9e5571d99d223011cbe82 Mon Sep 17 00:00:00 2001 From: Vigers Ray <60344369+VigersRay@users.noreply.github.com> Date: Wed, 12 Jun 2024 18:18:34 +0300 Subject: [PATCH 17/20] Test changelog (#76) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * пустой комит * пустой коммит 2 * update update_changelog.yml * update update_changelog.yml * update update_changelog.yml * попробуем так... * как же я заебался * ДА СУКА --- .github/workflows/update_changelog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index 097fb07cdf2..2bbdfd03906 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -33,4 +33,4 @@ jobs: git config --global user.email 'VigersRay@gmail.com' git add Resources/Changelog/ChangelogSunrise.yml git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}' - git push https://VigersRay:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:update-changelog-${{ github.run_id }} \ No newline at end of file + git push https://VigersRay:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master \ No newline at end of file From c91fe671a25239cc77d209cb084c42d4ac60eefa Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 12 Jun 2024 18:24:21 +0300 Subject: [PATCH 18/20] =?UTF-8?q?=D0=BD=D1=83=20=D1=80=D0=B0=D0=B4=D0=B8?= =?UTF-8?q?=20=D0=B1=D0=BE=D0=B3=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/update_changelog.yml | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/update_changelog.yml b/.github/workflows/update_changelog.yml index 2bbdfd03906..7ef38108dd0 100644 --- a/.github/workflows/update_changelog.yml +++ b/.github/workflows/update_changelog.yml @@ -13,24 +13,22 @@ jobs: steps: - name: Checkout Repository uses: actions/checkout@v3 - + - name: Set up Python uses: actions/setup-python@v2 with: python-version: '3.x' - + - name: Install Dependencies run: pip install pyyaml - + - name: Extract Changelog from PR run: python3 Tools/update_changelog.py "${{ github.event.pull_request.body }}" "Resources/Changelog/ChangelogSunrise.yml" - + - name: Commit and Push Changes - env: - GITHUB_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }} run: | git config --global user.name 'VigersRay' git config --global user.email 'VigersRay@gmail.com' git add Resources/Changelog/ChangelogSunrise.yml git commit -m 'Update changelog from PR #${{ github.event.pull_request.number }}' - git push https://VigersRay:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}.git HEAD:master \ No newline at end of file + git push https://VigersRay:${{ secrets.GH_TOKEN }}@github.com/VigersRay/${{ github.repository }}.git HEAD:master From 37d3a00c195a3f3ce004cc41056846cee78d0719 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 12 Jun 2024 18:45:58 +0300 Subject: [PATCH 19/20] =?UTF-8?q?=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=B8=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ss14-ru/prototypes/entities/mobs/npcs/silicon.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/silicon.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/silicon.ftl index 4e6d565caa5..5cfd7681e82 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/silicon.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/silicon.ftl @@ -12,3 +12,4 @@ ent-MobMimeBot = мимбот .desc = Почему бы не помахать мимботу? ent-MobSupplyBot = грузобот .desc = Доставляет грузы! + From ae615d848d974907dcdd44625d15bffa9d9a999b Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Wed, 12 Jun 2024 18:56:47 +0300 Subject: [PATCH 20/20] =?UTF-8?q?=D0=BF=D1=83=D1=81=D1=82=D0=BE=D0=B9=20?= =?UTF-8?q?=D1=87=D0=B5=D0=B9=D0=B6=D0=BD=D0=BB=D0=BE=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ru-RU/ss14-ru/prototypes/entities/mobs/npcs/silicon.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/silicon.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/silicon.ftl index 5cfd7681e82..4e6d565caa5 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/silicon.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/npcs/silicon.ftl @@ -12,4 +12,3 @@ ent-MobMimeBot = мимбот .desc = Почему бы не помахать мимботу? ent-MobSupplyBot = грузобот .desc = Доставляет грузы! -