Skip to content

Commit

Permalink
Update GH Actions
Browse files Browse the repository at this point in the history
  • Loading branch information
Saibamen committed Apr 26, 2024
1 parent 1363a74 commit b7b80bf
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/conflicts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: check if PRs are dirty
uses: eps1lon/actions-label-merge-conflict@releases/2.x
uses: eps1lon/actions-label-merge-conflict@v3
with:
dirtyLabel: "Conflicts"
repoToken: "${{ secrets.GITHUB_TOKEN }}"
Expand Down
26 changes: 13 additions & 13 deletions .github/workflows/docker_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ name: Build Server Docker Image
on:
pull_request:
paths-ignore:
- '*.md'
- 'OldReferenceCode/**'
- 'XMPP-ejabberd/**'
- 'OldReferenceCode/**'
- 'Files/Engine.ini'
- 'UT4MasterServer.Web/**'
- "*.md"
- "OldReferenceCode/**"
- "XMPP-ejabberd/**"
- "OldReferenceCode/**"
- "Files/Engine.ini"
- "UT4MasterServer.Web/**"
push:
paths-ignore:
- '*.md'
- 'OldReferenceCode/**'
- 'XMPP-ejabberd/**'
- 'OldReferenceCode/**'
- 'Files/Engine.ini'
- 'UT4MasterServer.Web/**'
- "*.md"
- "OldReferenceCode/**"
- "XMPP-ejabberd/**"
- "OldReferenceCode/**"
- "Files/Engine.ini"
- "UT4MasterServer.Web/**"

env:
IMAGE_NAME: ut4masterserver
Expand All @@ -25,7 +25,7 @@ jobs:
build-server:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build Docker Image
run: docker build --pull -t ${{ env.IMAGE_NAME }} -f ./UT4MasterServer/Dockerfile .
- name: Clean Up
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/docker_build_frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@ name: Build Frontend Docker Image
on:
pull_request:
paths:
- 'UT4MasterServer.Web/**'
- '.github/workflows/docker_build_frontend.yml'
- "UT4MasterServer.Web/**"
- ".github/workflows/docker_build_frontend.yml"
# ignored paths
- '!*.md'
- "!*.md"
push:
paths:
- 'UT4MasterServer.Web/**'
- '.github/workflows/docker_build_frontend.yml'
- "UT4MasterServer.Web/**"
- ".github/workflows/docker_build_frontend.yml"
# ignored paths
- '!*.md'
- "!*.md"

env:
IMAGE_NAME: ut4masterserver-web
Expand All @@ -21,7 +21,7 @@ jobs:
build-frontend:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build Frontend Docker Image
run: docker build --pull -t ${{ env.IMAGE_NAME }} -f ./UT4MasterServer.Web/.docker/Development.Dockerfile ./UT4MasterServer.Web/
- name: Clean Up
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/linters.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
linters:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: lts/*
- run: npm install --ignore-scripts
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.override.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"

services:
ut4masterserver:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: "3.7"
version: "3.8"

services:
ut4masterserver:
Expand Down

0 comments on commit b7b80bf

Please sign in to comment.