diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index f1e821f69..d1cb0f4aa 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -1,8 +1,8 @@ name: "pre-release" - +# not currently in use on: push: - branches: ["develop"] # TODO: change this to master when ready + branches: ["master"] paths: ['*', 'installer/**', '.github/**'] jobs: diff --git a/.github/workflows/release-installer.yml b/.github/workflows/release-installer.yml index 269ba6dcd..004206cb0 100644 --- a/.github/workflows/release-installer.yml +++ b/.github/workflows/release-installer.yml @@ -1,5 +1,6 @@ name: release-installer -'on': + +on: release: types: - published @@ -38,6 +39,7 @@ jobs: file: installer/dist/DXRandoInstaller.exe asset_name: DXRandoInstaller.exe tag: ${{ env.RELEASE_TAG }} + overwrite: true - name: Upload Release Asset BingoViewer id: upload-release-asset-bingoviewer @@ -47,6 +49,7 @@ jobs: file: installer/dist/BingoViewer.exe asset_name: BingoViewer.exe tag: ${{ env.RELEASE_TAG }} + overwrite: true linux: runs-on: ubuntu-latest @@ -57,19 +60,6 @@ jobs: - name: Check out repository code uses: actions/checkout@v4 - # update our testing tag - - if: ${{ startsWith(github.ref, 'refs/heads/') }} - name: Update tag - uses: actions/github-script@v7 - with: - script: | - github.rest.git.updateRef({ - owner: context.repo.owner, - repo: context.repo.repo, - ref: 'tags/testing', - sha: context.sha - }) - # install stuff and run tests - run: sudo apt-get update -y - run: sudo apt-get install -y python3-tk idle3 binutils @@ -84,6 +74,19 @@ jobs: run: echo "RELEASE_TAG=testing" >> $GITHUB_ENV shell: bash + # update our testing tag + - if: ${{ startsWith(github.ref, 'refs/heads/') }} + name: Update tag + uses: actions/github-script@v7 + with: + script: | + github.rest.git.updateRef({ + owner: context.repo.owner, + repo: context.repo.repo, + ref: 'tags/testing', + sha: context.sha + }) + # upload assets to release - name: Upload Release Asset DXRando id: upload-release-asset-dxrando @@ -93,6 +96,7 @@ jobs: file: installer/dist/DXRandoInstaller asset_name: DXRandoInstaller-Linux tag: ${{ env.RELEASE_TAG }} + overwrite: true - name: Upload Release Asset BingoViewer id: upload-release-asset-bingoviewer @@ -102,3 +106,4 @@ jobs: file: installer/dist/BingoViewer asset_name: BingoViewer-Linux tag: ${{ env.RELEASE_TAG }} + overwrite: true