diff --git a/.github/workflows/conflicts.yml b/.github/workflows/conflicts.yml index cd4a959f..81ebd605 100644 --- a/.github/workflows/conflicts.yml +++ b/.github/workflows/conflicts.yml @@ -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 }}" diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml index c04be33d..2aa6bc87 100644 --- a/.github/workflows/docker_build.yml +++ b/.github/workflows/docker_build.yml @@ -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 @@ -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 diff --git a/.github/workflows/docker_build_frontend.yml b/.github/workflows/docker_build_frontend.yml index 988837b3..b6d18194 100644 --- a/.github/workflows/docker_build_frontend.yml +++ b/.github/workflows/docker_build_frontend.yml @@ -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 @@ -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 diff --git a/.github/workflows/linters.yml b/.github/workflows/linters.yml index f59a261f..b77431ca 100644 --- a/.github/workflows/linters.yml +++ b/.github/workflows/linters.yml @@ -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 diff --git a/docker-compose.override.yml b/docker-compose.override.yml index fd8f682a..2b703a5e 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.8" services: ut4masterserver: diff --git a/docker-compose.yml b/docker-compose.yml index 0f7e6917..fad1a88c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: "3.7" +version: "3.8" services: ut4masterserver: