Skip to content

Commit

Permalink
Merge branch 'master' of github.com:SteamGridDB/steam-rom-manager
Browse files Browse the repository at this point in the history
  • Loading branch information
cbartondock committed Jun 10, 2024
2 parents 0a52ac7 + be02346 commit 071e0f1
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 13 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/discord_release_hook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4.1.6

- name: Setup Node.js environment
uses: actions/setup-node@v2.4.1
uses: actions/setup-node@v4.0.2
with:
node-version: 14.18.1
node-version: 22.2.0
check-latest: true

- name: Execute Discord webhook script
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ jobs:
os: [ubuntu-latest, windows-latest, macOS-latest]
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.6

- name: Setup Python environment
uses: actions/setup-python@v4
uses: actions/setup-python@v5.1.0
with:
python-version: '3.10'

- name: Setup Node.js environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4.0.2
with:
node-version: 22.2.0
check-latest: true
Expand Down Expand Up @@ -59,21 +59,21 @@ jobs:
env:
GH_TOKEN: ${{ secrets.DEPLOY_TOKEN }}
- name: Upload Artifacts Windows
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.3.3
if: ${{ matrix.os == 'windows-latest' }}
with:
name: srm-build-windows
path: |
release/*.exe
release/*.msi
- name: Upload Artifacts Mac
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.3.3
if: ${{ matrix.os == 'macOS-latest' }}
with:
name: srm-build-mac
path: release/*.dmg
- name: Upload Artifacts Linux
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.3.3
if: ${{ matrix.os == 'ubuntu-latest' }}
with:
name: srm-build-linux
Expand Down
21 changes: 17 additions & 4 deletions .github/workflows/pullrequests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,15 @@ jobs:
os: [ubuntu-latest, windows-latest, macOS-latest]
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v3
- uses: actions/checkout@v4.1.6

- name: Setup Python environment
uses: actions/setup-python@v5.1.0
with:
python-version: '3.10'

- name: Setup Node.js environment
uses: actions/setup-node@v3
uses: actions/setup-node@v4.0.2
with:
node-version: 22.2.0
check-latest: true
Expand Down Expand Up @@ -51,18 +56,26 @@ jobs:
run: npm run build:mac -- --publish=never

- name: Upload Artifacts Windows
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.3.3
if: ${{ matrix.os == 'windows-latest' }}
with:
name: srm-build-windows
path: |
release/*.exe
release/*.msi
- name: Upload Artifacts Linux
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.3.3
if: ${{ matrix.os == 'ubuntu-latest' }}
with:
name: srm-build-linux
path: |
release/*.deb
release/*.AppImage
- name: Upload Artifacts Mac
uses: actions/upload-artifact@v4.3.3
if: ${{ matrix.os == 'macOS-latest' }}
with:
name: srm-build-mac
path: |
release/*.dmg
release/*.zip

0 comments on commit 071e0f1

Please sign in to comment.