From 7145acc73f4fbdde64498729b3d5f73cfbc30486 Mon Sep 17 00:00:00 2001 From: Dan Balasescu Date: Thu, 5 Jun 2025 15:52:38 +0900 Subject: [PATCH] Enable nuget uploads and delete appveyor workflows --- .github/workflows/deploy.yml | 67 ++++++++++++++-------------- appveyor.yml | 32 -------------- appveyor_deploy.yml | 86 ------------------------------------ 3 files changed, 33 insertions(+), 152 deletions(-) delete mode 100644 appveyor.yml delete mode 100644 appveyor_deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6a3c15ef91..1a921b21ae 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -6,42 +6,41 @@ on: - '*' jobs: -# notify_pending_production_deploy: -# runs-on: ubuntu-latest -# steps: -# - -# name: Submit pending deployment notification -# run: | -# export TITLE="Pending osu Production Deployment: $GITHUB_REF_NAME" -# export URL="https://github.com/ppy/osu/actions/runs/$GITHUB_RUN_ID" -# export DESCRIPTION="Awaiting approval for building NuGet packages for tag $GITHUB_REF_NAME: -# [View Workflow Run]($URL)" -# export ACTOR_ICON="https://avatars.githubusercontent.com/u/$GITHUB_ACTOR_ID" -# -# BODY="$(jq --null-input '{ -# "embeds": [ -# { -# "title": env.TITLE, -# "color": 15098112, -# "description": env.DESCRIPTION, -# "url": env.URL, -# "author": { -# "name": env.GITHUB_ACTOR, -# "icon_url": env.ACTOR_ICON -# } -# } -# ] -# }')" -# -# curl \ -# -H "Content-Type: application/json" \ -# -d "$BODY" \ -# "${{ secrets.DISCORD_INFRA_WEBHOOK_URL }}" + notify_pending_production_deploy: + runs-on: ubuntu-latest + steps: + - name: Submit pending deployment notification + run: | + export TITLE="Pending osu Production Deployment: $GITHUB_REF_NAME" + export URL="https://github.com/ppy/osu/actions/runs/$GITHUB_RUN_ID" + export DESCRIPTION="Awaiting approval for building NuGet packages for tag $GITHUB_REF_NAME: + [View Workflow Run]($URL)" + export ACTOR_ICON="https://avatars.githubusercontent.com/u/$GITHUB_ACTOR_ID" + + BODY="$(jq --null-input '{ + "embeds": [ + { + "title": env.TITLE, + "color": 15098112, + "description": env.DESCRIPTION, + "url": env.URL, + "author": { + "name": env.GITHUB_ACTOR, + "icon_url": env.ACTOR_ICON + } + } + ] + }')" + + curl \ + -H "Content-Type: application/json" \ + -d "$BODY" \ + "${{ secrets.DISCORD_INFRA_WEBHOOK_URL }}" pack: name: Pack runs-on: ubuntu-latest -# environment: production + environment: production steps: - name: Checkout uses: actions/checkout@v4 @@ -84,5 +83,5 @@ jobs: ${{steps.artifactsPath.outputs.nuget_artifacts}}/*.nupkg ${{steps.artifactsPath.outputs.nuget_artifacts}}/*.snupkg -# - name: Publish packages to nuget.org -# run: dotnet nuget push ${{steps.artifactsPath.outputs.nuget_artifacts}}/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json + - name: Publish packages to nuget.org + run: dotnet nuget push ${{steps.artifactsPath.outputs.nuget_artifacts}}/*.nupkg --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json diff --git a/appveyor.yml b/appveyor.yml deleted file mode 100644 index ed48a997e8..0000000000 --- a/appveyor.yml +++ /dev/null @@ -1,32 +0,0 @@ -clone_depth: 1 -version: '{branch}-{build}' -image: Visual Studio 2022 -cache: - - '%LOCALAPPDATA%\NuGet\v3-cache -> appveyor.yml' - -dotnet_csproj: - patch: true - file: 'osu.Game\osu.Game.csproj' # Use wildcard when it's able to exclude Xamarin projects - version: '0.0.{build}' - -before_build: - - cmd: dotnet --info # Useful when version mismatch between CI and local - - cmd: dotnet workload install maui-android # Change to `dotnet workload restore` once there's no old projects - - cmd: dotnet workload install maui-ios # Change to `dotnet workload restore` once there's no old projects - - cmd: nuget restore -verbosity quiet # Only nuget.exe knows both new (.NET Core) and old (Xamarin) projects - -build: - project: osu.sln - parallel: true - verbosity: minimal - publish_nuget: true - -after_build: - - ps: .\InspectCode.ps1 - -test: - assemblies: - except: - - '**\*Android*' - - '**\*iOS*' - - 'build\**\*' diff --git a/appveyor_deploy.yml b/appveyor_deploy.yml deleted file mode 100644 index 175c8d0f1b..0000000000 --- a/appveyor_deploy.yml +++ /dev/null @@ -1,86 +0,0 @@ -clone_depth: 1 -version: '{build}' -image: Visual Studio 2022 -test: off -skip_non_tags: true -configuration: Release - -environment: - matrix: - - job_name: osu-game - - job_name: osu-ruleset - job_depends_on: osu-game - - job_name: taiko-ruleset - job_depends_on: osu-game - - job_name: catch-ruleset - job_depends_on: osu-game - - job_name: mania-ruleset - job_depends_on: osu-game - - job_name: templates - job_depends_on: osu-game - -nuget: - project_feed: true - -for: - - - matrix: - only: - - job_name: osu-game - build_script: - - cmd: dotnet pack osu.Game\osu.Game.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME% - - - matrix: - only: - - job_name: osu-ruleset - build_script: - - cmd: dotnet remove osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj reference osu.Game\osu.Game.csproj - - cmd: dotnet add osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME% - - cmd: dotnet pack osu.Game.Rulesets.Osu\osu.Game.Rulesets.Osu.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME% - - - matrix: - only: - - job_name: taiko-ruleset - build_script: - - cmd: dotnet remove osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj reference osu.Game\osu.Game.csproj - - cmd: dotnet add osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME% - - cmd: dotnet pack osu.Game.Rulesets.Taiko\osu.Game.Rulesets.Taiko.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME% - - - matrix: - only: - - job_name: catch-ruleset - build_script: - - cmd: dotnet remove osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj reference osu.Game\osu.Game.csproj - - cmd: dotnet add osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME% - - cmd: dotnet pack osu.Game.Rulesets.Catch\osu.Game.Rulesets.Catch.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME% - - - matrix: - only: - - job_name: mania-ruleset - build_script: - - cmd: dotnet remove osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj reference osu.Game\osu.Game.csproj - - cmd: dotnet add osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME% - - cmd: dotnet pack osu.Game.Rulesets.Mania\osu.Game.Rulesets.Mania.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME% - - - matrix: - only: - - job_name: templates - build_script: - - cmd: dotnet remove Templates\Rulesets\ruleset-empty\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj reference osu.Game\osu.Game.csproj - - cmd: dotnet remove Templates\Rulesets\ruleset-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj reference osu.Game\osu.Game.csproj - - cmd: dotnet remove Templates\Rulesets\ruleset-scrolling-empty\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj reference osu.Game\osu.Game.csproj - - cmd: dotnet remove Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj reference osu.Game\osu.Game.csproj - - - cmd: dotnet add Templates\Rulesets\ruleset-empty\osu.Game.Rulesets.EmptyFreeform\osu.Game.Rulesets.EmptyFreeform.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME% - - cmd: dotnet add Templates\Rulesets\ruleset-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME% - - cmd: dotnet add Templates\Rulesets\ruleset-scrolling-empty\osu.Game.Rulesets.EmptyScrolling\osu.Game.Rulesets.EmptyScrolling.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME% - - cmd: dotnet add Templates\Rulesets\ruleset-scrolling-example\osu.Game.Rulesets.Pippidon\osu.Game.Rulesets.Pippidon.csproj package ppy.osu.Game -v %APPVEYOR_REPO_TAG_NAME% - - - cmd: dotnet pack Templates\osu.Game.Templates.csproj /p:Version=%APPVEYOR_REPO_TAG_NAME% - -artifacts: - - path: '**\*.nupkg' - -deploy: - - provider: Environment - name: nuget