Skip to content

Commit 1bd0ff6

Browse files
authored
Update workflow files
1 parent a79a764 commit 1bd0ff6

File tree

8 files changed

+15
-303
lines changed

8 files changed

+15
-303
lines changed

.github/workflows/build.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
name: Build
22

3-
# Trigger the workflow on any pull request, push or manual dispatch
4-
on: [pull_request, push, workflow_dispatch]
3+
on:
4+
push:
5+
branches:
6+
- release/1.6.0
7+
workflow_dispatch:
58

69
jobs:
710
windows:
@@ -73,7 +76,7 @@ jobs:
7376
name: linux-${{ matrix.architecture }}
7477
runs-on: ubuntu-latest
7578
container:
76-
image: docker://ghcr.io/multitheftauto/mtasa-blue-build:latest
79+
image: docker://ghcr.io/multitheftauto/mtasa-blue-build:1.6.0
7780
steps:
7881
- uses: actions/checkout@v4
7982

.github/workflows/codeql.yml

Lines changed: 0 additions & 104 deletions
This file was deleted.

.github/workflows/crowdin-auto-merge.yml

Lines changed: 0 additions & 31 deletions
This file was deleted.

.github/workflows/dockerimage.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
workflow_dispatch:
55
push:
66
branches:
7-
- master
7+
- release/1.6.0
88
paths:
99
- '.github/workflows/build.yaml'
1010
- '.github/workflows/dockerimage.yaml'
@@ -26,4 +26,4 @@ jobs:
2626
with:
2727
push: true
2828
context: utils/docker
29-
tags: ghcr.io/multitheftauto/mtasa-blue-build:latest
29+
tags: ghcr.io/multitheftauto/mtasa-blue-build:1.6.0

.github/workflows/rebuild-pots.yaml

Lines changed: 0 additions & 83 deletions
This file was deleted.

.github/workflows/run-generate-translators.yaml

Lines changed: 0 additions & 52 deletions
This file was deleted.

.github/workflows/stale.yaml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/sync-master-to-maetro.yaml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ name: 'Sync master to maetro'
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches:
6+
- release/1.6.0
67
workflow_dispatch:
78

89
jobs:
@@ -22,8 +23,8 @@ jobs:
2223
git config --global user.name "Maetro Bot"
2324
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
2425
25-
git checkout release/maetro
26-
git merge master --no-ff --no-edit --no-commit || true
26+
git checkout release/1.6.0m
27+
git merge release/1.6.0 --no-ff --no-edit --no-commit || true
2728
2829
# Discard locale conflicts
2930
git checkout --ours -- Shared/installer/locale "Shared/data/MTA San Andreas/MTA/locale"
@@ -45,8 +46,8 @@ jobs:
4546
git add --verbose "Client/loader/MainFunctions.cpp"
4647
4748
# We should be done with the merge now
48-
printf "Synchronize changes from 1.6 master branch [ci skip]\n\n" > commit.txt
49-
git log --expand-tabs=4 --pretty=format:'%h %s' release/maetro..master >> commit.txt
49+
printf "Synchronize changes from 1.6 branch [ci skip]\n\n" > commit.txt
50+
git log --expand-tabs=4 --pretty=format:'%h %s' release/1.6.0m..release/1.6.0 >> commit.txt
5051
git commit --no-edit --allow-empty -F commit.txt
5152
52-
git push origin release/maetro
53+
git push origin release/1.6.0m

0 commit comments

Comments
 (0)