Skip to content

Commit

Permalink
Update deprecated github actions
Browse files Browse the repository at this point in the history
  • Loading branch information
OmniBlade committed Jun 14, 2024
1 parent b3b99b8 commit 6233416
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
os: [ubuntu-22.04]

steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v4
with:
submodules: 'true'
fetch-depth: 0
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
- name: Upload artifact
if: ${{ matrix.networking == 'net' }}
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4
with:
name: vanilla-conquer-linux-${{ matrix.platform }}-${{ matrix.os }}-x86_64
path: artifact
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
networking: [net, nonet]

steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v4
with:
submodules: 'true'
fetch-depth: 0
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
- name: Upload artifact
if: ${{ matrix.networking == 'net' }}
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4
with:
name: vanilla-conquer-macos-clang-universal2
path: artifact
Expand Down
14 changes: 8 additions & 6 deletions .github/workflows/mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
remaster_gcc:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v4
with:
submodules: 'true'
fetch-depth: 0
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
7z a artifact/vanilla-td-remaster-mod-gcc-${{ steps.gitinfo.outputs.sha_short }}.zip ./build/Vanilla_TD
- name: Upload artifact
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4
with:
name: vanilla-conquer-remaster-gcc
path: artifact
Expand All @@ -61,7 +61,7 @@ jobs:
networking: [net, nonet]

steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v4
with:
submodules: 'true'
fetch-depth: 0
Expand Down Expand Up @@ -111,19 +111,21 @@ jobs:
${{ steps.vars.outputs.arc_path }}-w64-mingw32-objcopy --add-gnu-debuglink=./build/vanillamix.dbg ./build/vanillamix.exe
- name: Create archives
if: ${{ matrix.networking == 'net' }}
run: |
mkdir artifact
7z a artifact/vanilla-conquer-win-gcc-${{ steps.vars.outputs.arc_path }}-${{ steps.gitinfo.outputs.sha_short }}.zip ./build/vanillatd.exe ./build/vanillara.exe ./build/vanillamix.exe /tmp/SDL2-2.0.12/${{ steps.vars.outputs.arc_path }}-w64-mingw32/bin/SDL2.dll /tmp/openal-soft-1.21.0-bin/bin/${{ steps.vars.outputs.oal_path }}/OpenAL32.dll
7z a artifact/vanilla-conquer-win-gcc-${{ steps.vars.outputs.arc_path }}-${{ steps.gitinfo.outputs.sha_short }}-debug.zip ./build/vanillatd.dbg ./build/vanillara.dbg ./build/vanillamix.dbg
- name: Upload artifact
uses: actions/[email protected]
uses: actions/upload-artifact@v4
if: ${{ matrix.networking == 'net' }}
with:
name: vanilla-conquer-win-gcc-${{ steps.vars.outputs.arc_path }}
path: artifact

- name: Upload development release
if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/vanilla' }}
if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/vanilla' && matrix.networking == 'net' }}
uses: softprops/action-gh-release@v1
with:
name: Development Build
Expand All @@ -135,7 +137,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload tagged release
if: ${{ startsWith(github.ref, 'refs/tags/') }}
if: ${{ startsWith(github.ref, 'refs/tags/') && matrix.networking == 'net' }}
uses: softprops/action-gh-release@v1
with:
files: |
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
remaster_msvc:
runs-on: windows-2019
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v4
with:
submodules: 'true'
fetch-depth: 0
Expand Down Expand Up @@ -47,7 +47,7 @@ jobs:
7z a artifact/vanilla-td-remaster-mod-msvc-${{ steps.gitinfo.outputs.sha_short }}.zip ./build/Vanilla_TD
- name: Upload artifact
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4
with:
name: vanilla-conquer-remaster-msvc
path: artifact
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
platform: [x86, amd64]
networking: [net, nonet]
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v4
with:
submodules: 'true'
fetch-depth: 0
Expand Down Expand Up @@ -145,7 +145,7 @@ jobs:
- name: Upload artifact
if: ${{ matrix.networking == 'net' }}
uses: actions/upload-artifact@v3.1.2
uses: actions/upload-artifact@v4
with:
name: vanilla-conquer-win-msvc-${{ steps.vars.outputs.arc_path }}
path: artifact
Expand Down

0 comments on commit 6233416

Please sign in to comment.