From adf988c3dc7579bed139f8ffaabb9747144f6b7f Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:09:25 +0300 Subject: [PATCH 1/8] try fix publish --- .github/workflows/publish.yml | 38 +++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4c2db33dcf4..f64cfaf20be 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,16 +1,16 @@ name: Publish -concurrency: - group: publish +#concurrency: +# group: publish on: workflow_dispatch: schedule: - - cron: '0 10 * * *' + - cron: '0 1 * * *' jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: # - name: Install dependencies @@ -42,11 +42,23 @@ jobs: - name: Package client run: dotnet run --project Content.Packaging client --no-wipe-release + - name: Upload build artifact + id: artifact-upload-step + uses: actions/upload-artifact@v4 + with: + name: build + path: release/*.zip + compression-level: 0 + retention-days: 0 + - name: Publish version - run: Tools/publish_multi_request.py + run: Tools/publish_github_artifact.py env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }} + ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }} GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }} + FORK_ID: ${{ vars.FORK_ID }} # - name: Publish changelog (Discord) # run: Tools/actions_changelogs_since_last_run.py @@ -54,12 +66,12 @@ jobs: # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }} - - name: Publish changelog (RSS) - run: Tools/actions_changelog_rss.py - env: - CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }} + # - name: Publish changelog (RSS) + # run: Tools/actions_changelog_rss.py + # env: + # CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }} - #- uses: geekyeggo/delete-artifact@v5 - # if: always() - # with: - # name: build + - uses: geekyeggo/delete-artifact@v5 + if: always() + with: + name: build From 6423e5e7ac647921294ef6601bf6e8f7408108d9 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:20:04 +0300 Subject: [PATCH 2/8] try fix publish 2 --- .github/workflows/publish.yml | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f64cfaf20be..5966f5ad8ca 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,7 +1,7 @@ name: Publish -#concurrency: -# group: publish +concurrency: + group: publish on: workflow_dispatch: @@ -42,21 +42,10 @@ jobs: - name: Package client run: dotnet run --project Content.Packaging client --no-wipe-release - - name: Upload build artifact - id: artifact-upload-step - uses: actions/upload-artifact@v4 - with: - name: build - path: release/*.zip - compression-level: 0 - retention-days: 0 - - name: Publish version - run: Tools/publish_github_artifact.py + run: Tools/publish_multi_request.py env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }} - ARTIFACT_ID: ${{ steps.artifact-upload-step.outputs.artifact-id }} GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }} FORK_ID: ${{ vars.FORK_ID }} @@ -70,8 +59,3 @@ jobs: # run: Tools/actions_changelog_rss.py # env: # CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }} - - - uses: geekyeggo/delete-artifact@v5 - if: always() - with: - name: build From 40d6b687d8f0649714ec4e0857a46d441a7a21a7 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:31:50 +0300 Subject: [PATCH 3/8] try fix publish v3 --- .github/workflows/publish.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5966f5ad8ca..37363a73514 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,20 +6,19 @@ concurrency: on: workflow_dispatch: schedule: - - cron: '0 1 * * *' + - cron: '0 10 * * *' jobs: build: runs-on: ubuntu-latest steps: -# - name: Install dependencies -# run: sudo apt-get install -y python3-paramiko python3-lxml + - name: Install dependencies + run: sudo apt-get install -y python3-paramiko python3-lxml - uses: actions/checkout@v3.6.0 with: submodules: 'recursive' - - name: Setup .NET Core uses: actions/setup-dotnet@v3.2.0 with: @@ -45,17 +44,18 @@ jobs: - name: Publish version run: Tools/publish_multi_request.py env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }} GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }} FORK_ID: ${{ vars.FORK_ID }} - # - name: Publish changelog (Discord) - # run: Tools/actions_changelogs_since_last_run.py - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }} + #- name: Publish changelog (Discord) + # run: Tools/actions_changelogs_since_last_run.py + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }} - # - name: Publish changelog (RSS) - # run: Tools/actions_changelog_rss.py - # env: - # CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }} + #- name: Publish changelog (RSS) + # run: Tools/actions_changelog_rss.py + # env: + # CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }} From 38fec43476b2367e4ca83ebc2b9ee41a678585a6 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:57:58 +0300 Subject: [PATCH 4/8] Update publish.yml --- .github/workflows/publish.yml | 49 ++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 18 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 37363a73514..cd67f2df7b4 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,24 +1,25 @@ name: Publish -concurrency: - group: publish +#concurrency: +# group: publish on: workflow_dispatch: schedule: - - cron: '0 10 * * *' + - cron: '0 1 * * *' jobs: build: runs-on: ubuntu-latest steps: - - name: Install dependencies - run: sudo apt-get install -y python3-paramiko python3-lxml +# - name: Install dependencies +# run: sudo apt-get install -y python3-paramiko python3-lxml - uses: actions/checkout@v3.6.0 with: submodules: 'recursive' + - name: Setup .NET Core uses: actions/setup-dotnet@v3.2.0 with: @@ -41,21 +42,33 @@ jobs: - name: Package client run: dotnet run --project Content.Packaging client --no-wipe-release + - name: Upload build artifact + id: artifact-upload-step + uses: actions/upload-artifact@v4 + with: + name: build + path: release/*.zip + compression-level: 0 + retention-days: 0 + - name: Publish version run: Tools/publish_multi_request.py env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }} GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }} - FORK_ID: ${{ vars.FORK_ID }} - - #- name: Publish changelog (Discord) - # run: Tools/actions_changelogs_since_last_run.py - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }} - - #- name: Publish changelog (RSS) - # run: Tools/actions_changelog_rss.py - # env: - # CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }} + + # - name: Publish changelog (Discord) + # run: Tools/actions_changelogs_since_last_run.py + # env: + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # DISCORD_WEBHOOK_URL: ${{ secrets.CHANGELOG_DISCORD_WEBHOOK }} + + # - name: Publish changelog (RSS) + # run: Tools/actions_changelog_rss.py + # env: + # CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }} + + - uses: geekyeggo/delete-artifact@v5 + if: always() + with: + name: build From 8fb7939815861889be7444a155df33a03afd32d8 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 4 Oct 2024 17:08:30 +0300 Subject: [PATCH 5/8] Update publish.yml --- .github/workflows/publish.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index cd67f2df7b4..be728dcf5ee 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -56,6 +56,7 @@ jobs: env: PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }} GITHUB_REPOSITORY: ${{ vars.GITHUB_REPOSITORY }} + FORK_ID: ${{ vars.FORK_ID }} # - name: Publish changelog (Discord) # run: Tools/actions_changelogs_since_last_run.py From 8b0129b3a09d086b0020f1d509741c36f5b08323 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 4 Oct 2024 17:09:58 +0300 Subject: [PATCH 6/8] try fix publish --- Tools/publish_multi_request.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/publish_multi_request.py b/Tools/publish_multi_request.py index a63359afd6c..b1478e8dac7 100755 --- a/Tools/publish_multi_request.py +++ b/Tools/publish_multi_request.py @@ -15,7 +15,7 @@ # Forks should change these to publish to their own infrastructure. # ROBUST_CDN_URL = "https://wizards.cdn.spacestation14.com/" -FORK_ID = "wizards" +FORK_ID = os.environ["FORK_ID"] def main(): session = requests.Session() From cd3301bcf86af4c751d6784e0435620d6bef7cd5 Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 4 Oct 2024 17:21:03 +0300 Subject: [PATCH 7/8] try fix publish --- Tools/publish_multi_request.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/publish_multi_request.py b/Tools/publish_multi_request.py index b1478e8dac7..fad1f3a2aa6 100755 --- a/Tools/publish_multi_request.py +++ b/Tools/publish_multi_request.py @@ -14,7 +14,7 @@ # CONFIGURATION PARAMETERS # Forks should change these to publish to their own infrastructure. # -ROBUST_CDN_URL = "https://wizards.cdn.spacestation14.com/" +ROBUST_CDN_URL = "https://cdn.station14.ru/" FORK_ID = os.environ["FORK_ID"] def main(): From e62b82ff96a2dd831962fa9820e78cce2442b48a Mon Sep 17 00:00:00 2001 From: Dmitriy <108795395+Sh1ntra@users.noreply.github.com> Date: Fri, 4 Oct 2024 17:44:54 +0300 Subject: [PATCH 8/8] clear up publish --- .github/workflows/publish.yml | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index be728dcf5ee..ee4bdda7bfe 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -42,15 +42,6 @@ jobs: - name: Package client run: dotnet run --project Content.Packaging client --no-wipe-release - - name: Upload build artifact - id: artifact-upload-step - uses: actions/upload-artifact@v4 - with: - name: build - path: release/*.zip - compression-level: 0 - retention-days: 0 - - name: Publish version run: Tools/publish_multi_request.py env: @@ -69,7 +60,7 @@ jobs: # env: # CHANGELOG_RSS_KEY: ${{ secrets.CHANGELOG_RSS_KEY }} - - uses: geekyeggo/delete-artifact@v5 - if: always() - with: - name: build + #- uses: geekyeggo/delete-artifact@v5 + # if: always() + # with: + # name: build