diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5c7276926..aa0371908 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -2,18 +2,18 @@ name: Deploy on: workflow_dispatch: - # workflow_run: - # branches: [main] - # workflows: [Build-Test] - # types: - # - completed + workflow_run: + branches: [dev_dust765] + workflows: [Build-Test] + types: + - completed env: CUO_ASSEMBLY_VERSION: '0.1.11.${{ github.run_number }}' CUO_OUTPUT_PATH: 'bin/dist' CUO_PROJECT_PATH: "src/ClassicUO.csproj" - CUO_ZIP_NAME: "ClassicUO-dev-preview-release.zip" + CUO_ZIP_NAME: "ClassicUO-dev-dust765.zip" DOTNET_NOLOGO: false DOTNET_CLI_TELEMETRY_OPTOUT: 1 @@ -22,7 +22,7 @@ env: jobs: build: - #if: ${{ github.event.workflow_run.conclusion == 'success' }} && "${{ env.GITHUB_REPOSITORY }}" == 'ClassicUO/ClassicUO' + if: ${{ github.event.workflow_run.conclusion == 'success' }} || github.event_name == 'workflow_dispatch' }} runs-on: ${{ matrix.os }} strategy: matrix: @@ -54,7 +54,7 @@ jobs: exclusions: 'ClassicUO.exe.config' - name: Create manifest - run: dotnet run --project tools/ManifestCreator/ManifestCreator.csproj "${{ env.CUO_OUTPUT_PATH }}" "dev-preview" "${{ env.CUO_ZIP_NAME }}" + run: dotnet run --project tools/ManifestCreator/ManifestCreator.csproj "${{ env.CUO_OUTPUT_PATH }}" "dev-dust765" "${{ env.CUO_ZIP_NAME }}" - name: Move output run: | @@ -66,7 +66,7 @@ jobs: uses: dev-drprasad/delete-tag-and-release@v0.2.0 with: delete_release: true - tag_name: ClassicUO-dev-release + tag_name: ClassicUO-dev-dust765-release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -74,19 +74,8 @@ jobs: uses: ncipollo/release-action@v1 with: artifacts: "upload/${{ env.CUO_ZIP_NAME }}" - name: 'ClassicUO dev preview' + name: '0.1.11.${{ github.run_number }} dev_dust765' body: 'This build may not be safe: use it at your own risk.' - prerelease: true - tag: ClassicUO-dev-release + tag: ClassicUO-dev-dust765-release token: ${{ secrets.GITHUB_TOKEN }} - - name: FTP Deploy - uses: SamKirkland/FTP-Deploy-Action@4.3.2 - with: - server: ftp.classicuo.eu - username: ${{ secrets.FTP_USER }} - password: ${{ secrets.FTP_PSW }} - protocol: ftps - server-dir: /www.classicuo.eu/dev/deploy/ - local-dir: upload/ -