From 6b87121350ae23f149a10deb5f62e8e26b7b77af Mon Sep 17 00:00:00 2001 From: UbitUmarov Date: Mon, 27 Nov 2023 15:34:46 +0000 Subject: [PATCH] remove github action for net48 --- .github/workflows/msbuild48.yml | 57 ------------------------------- .github/workflows/msbuildnet6.yml | 5 ++- BUILDING.md | 3 -- 3 files changed, 2 insertions(+), 63 deletions(-) delete mode 100644 .github/workflows/msbuild48.yml diff --git a/.github/workflows/msbuild48.yml b/.github/workflows/msbuild48.yml deleted file mode 100644 index 1545fc79b5..0000000000 --- a/.github/workflows/msbuild48.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: .msbuild48 - -on: - push: - branches: [ "master" ] - paths: - - '**.cs' - workflow_dispatch: - -jobs: - build: - if: github.repository == 'opensim/opensim' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - name: shortsha - id: vars - run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" - - name: preBuild - run: bash ${GITHUB_WORKSPACE}/runprebuild48.sh - - - name: Build - id: build - run: msbuild /p:Configuration=Release OpenSim.sln - - - name: release - if: success() - run: zip -r LastBuild.zip bin ThirdPartyLicenses README.md CONTRIBUTORS.txt LICENSE.txt - - uses: softprops/action-gh-release@v1 - if: success() - with: - tag_name: r${{ steps.vars.outputs.sha_short }} - name: LastAutoBuild - files: LastBuild.zip - - - name: report push to irc if from main OpenSim repository - if: github.event_name == 'push' && github.repository_owner == 'opensim' - uses: rectalogic/notify-irc@v1 - with: - channel: "#opensim-dev" - server: "irc.libera.chat" - nickname: osgithub - message: | - ${{ github.actor }} pushed to ${{ github.repository }} - ${{ join(github.event.commits.*.message, '\n') }} - mono framework4.8 compile: ${{ steps.build.conclusion }} - - - name: manual report to irc if from main OpenSim repository - if: github.event_name == 'workflow_dispatch' && github.repository_owner == 'opensim' - uses: rectalogic/notify-irc@v1 - with: - channel: "#opensim-dev" - server: "irc.libera.chat" - nickname: osgithub - message: | - ${{ github.repository }} - mono framework4.8 compile: ${{ steps.build.conclusion }} diff --git a/.github/workflows/msbuildnet6.yml b/.github/workflows/msbuildnet6.yml index 2975e2f738..bee12ac61c 100644 --- a/.github/workflows/msbuildnet6.yml +++ b/.github/workflows/msbuildnet6.yml @@ -2,7 +2,7 @@ name: .msbuildnet6 on: push: - branches: [ "dotnet6" ] + branches: [ "master" ] paths: - '**.cs' workflow_dispatch: @@ -10,11 +10,10 @@ on: jobs: build: + if: github.repository == 'opensim/opensim' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - with: - ref: dotnet6 - name: shortsha id: vars run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" diff --git a/BUILDING.md b/BUILDING.md index 9e2405c593..0c612d0d12 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -4,9 +4,6 @@ get or update source from git `git clone git://opensimulator.org/git/opensim` -change to dotnet6 test branch - - `git checkout dotnet6` # Building on Windows