Skip to content

Commit aedb1d5

Browse files
marcnausemarcnause
authored
chore: update GitHub workflows due to changed branch names (#3230)
1 parent 3f78b19 commit aedb1d5

3 files changed

Lines changed: 51 additions & 51 deletions

File tree

‎.github/workflows/pull-request-closed.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Delete Screenshots
22

33
on:
44
pull_request_target:
5-
branches: [ "flutter" ]
5+
branches: [ "main" ]
66
types:
77
- closed
88

‎.github/workflows/pull-request.yml‎

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

33
on:
44
pull_request:
5-
branches: ["flutter"]
5+
branches: [ "main" ]
66

77
concurrency:
88
group: ${{ github.workflow }}-${{ github.ref }}
@@ -63,7 +63,7 @@ jobs:
6363

6464
android:
6565
name: Android Flutter Build
66-
needs: [changes, common]
66+
needs: [ changes, common ]
6767
runs-on: ubuntu-latest
6868
steps:
6969
- uses: actions/checkout@v6
@@ -79,7 +79,7 @@ jobs:
7979

8080
ios:
8181
name: iOS Flutter Build
82-
needs: [changes, common]
82+
needs: [ changes, common ]
8383
runs-on: ${{ needs.changes.outputs.is_code == 'true' && 'macos-latest' || 'ubuntu-latest' }}
8484
steps:
8585
- name: Set up Xcode
@@ -101,7 +101,7 @@ jobs:
101101

102102
screenshots-android:
103103
name: Screenshots (Android)
104-
needs: [changes, common]
104+
needs: [ changes, common ]
105105
runs-on: ubuntu-latest
106106
timeout-minutes: 30
107107
steps:
@@ -121,7 +121,7 @@ jobs:
121121

122122
screenshots-iphone:
123123
name: Screenshots (iPhone)
124-
needs: [changes, common]
124+
needs: [ changes, common ]
125125
runs-on: ${{ needs.changes.outputs.is_code == 'true' && 'macos-latest' || 'ubuntu-latest' }}
126126
timeout-minutes: 30
127127
steps:
@@ -146,7 +146,7 @@ jobs:
146146

147147
screenshots-ipad:
148148
name: Screenshots (iPad)
149-
needs: [changes, common]
149+
needs: [ changes, common ]
150150
runs-on: ${{ needs.changes.outputs.is_code == 'true' && 'macos-latest' || 'ubuntu-latest' }}
151151
timeout-minutes: 30
152152
steps:
@@ -171,7 +171,7 @@ jobs:
171171

172172
windows:
173173
name: Windows Flutter Build
174-
needs: [changes, common]
174+
needs: [ changes, common ]
175175
runs-on: ${{ needs.changes.outputs.is_code == 'true' && 'windows-latest' || 'ubuntu-latest' }}
176176
steps:
177177
- uses: actions/checkout@v6
@@ -187,7 +187,7 @@ jobs:
187187

188188
linux:
189189
name: Linux Flutter Build
190-
needs: [changes, common]
190+
needs: [ changes, common ]
191191
runs-on: ubuntu-latest
192192
steps:
193193
- uses: actions/checkout@v6
@@ -203,7 +203,7 @@ jobs:
203203

204204
linux-arm64:
205205
name: Linux ARM64 Flutter Build
206-
needs: [changes, common]
206+
needs: [ changes, common ]
207207
runs-on: ${{ needs.changes.outputs.is_code == 'true' && 'ubuntu-24.04-arm' || 'ubuntu-latest' }}
208208
steps:
209209
- uses: actions/checkout@v6
@@ -219,7 +219,7 @@ jobs:
219219

220220
macos:
221221
name: macOS Flutter Build
222-
needs: [changes, common]
222+
needs: [ changes, common ]
223223
runs-on: ${{ needs.changes.outputs.is_code == 'true' && 'macos-latest' || 'ubuntu-latest' }}
224224
steps:
225225
- name: Set up Xcode

‎.github/workflows/push-event.yml‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Push
22

33
on:
44
push:
5-
branches: ["flutter"]
5+
branches: [ "main" ]
66
paths-ignore:
77
- '**.md'
88
- 'docs/**'
@@ -111,14 +111,14 @@ jobs:
111111
name: AAB Generated
112112
path: build/app/outputs/bundle
113113

114-
- name: Upload APK/AAB to apk branch
114+
- name: Upload APK/AAB to app branch
115115
if: ${{ github.repository == 'fossasia/pslab-app' }}
116116
run: |
117117
git config --global user.name "github-actions[bot]"
118118
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
119119
120-
git clone --branch=apk https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} apk
121-
cd apk
120+
git clone --branch=app https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} app
121+
cd app
122122
123123
branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
124124
@@ -143,14 +143,14 @@ jobs:
143143
144144
ls
145145
146-
echo "Pushing to apk branch"
146+
echo "Pushing to app branch"
147147
148148
git checkout --orphan temporary
149149
git add --all .
150150
git commit -am "[Auto] Update APK/AABs from $branch ($(date +%Y-%m-%d.%H:%M:%S))"
151-
git branch -D apk
152-
git branch -m apk
153-
git push --force origin apk
151+
git branch -D app
152+
git branch -m app
153+
git push --force origin app
154154
155155
- name: Update app in Open Testing track
156156
if: ${{ github.repository == 'fossasia/pslab-app' }}
@@ -170,7 +170,7 @@ jobs:
170170
uses: maxim-lobanov/setup-xcode@v1.7.0
171171
with:
172172
xcode-version: '26.3.0'
173-
173+
174174
- uses: actions/checkout@v6
175175

176176
- name: Prepare Build Keys
@@ -281,15 +281,15 @@ jobs:
281281
VERSION_NAME: ${{needs.common.outputs.VERSION_NAME}}
282282
VERSION_CODE: ${{needs.common.outputs.VERSION_CODE}}
283283

284-
- name: Upload installer to apk branch
284+
- name: Upload installer to app branch
285285
if: ${{ github.repository == 'fossasia/pslab-app' }}
286286
shell: bash
287287
run: |
288288
git config --global user.name "github-actions[bot]"
289289
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
290290
291-
git clone --branch=apk https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} apk
292-
cd apk
291+
git clone --branch=app https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} app
292+
cd app
293293
294294
branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
295295
@@ -301,14 +301,14 @@ jobs:
301301
302302
cp -v ../build/windows/x64/installer/Release/*.exe .
303303
304-
echo "Pushing to apk branch"
304+
echo "Pushing to app branch"
305305
306306
git checkout --orphan temporary
307307
git add --all .
308308
git commit -am "[Auto] Update Windows Installer from $branch ($(date +%Y-%m-%d.%H:%M:%S))"
309-
git branch -D apk
310-
git branch -m apk
311-
git push --force origin apk
309+
git branch -D app
310+
git branch -m app
311+
git push --force origin app
312312
313313
linux:
314314
name: Linux Flutter Build
@@ -322,15 +322,15 @@ jobs:
322322
with:
323323
VERSION_NAME: ${{needs.common.outputs.VERSION_NAME}}
324324
VERSION_CODE: ${{needs.common.outputs.VERSION_CODE}}
325-
326-
- name: Upload packages to apk branch
325+
326+
- name: Upload packages to app branch
327327
if: ${{ github.repository == 'fossasia/pslab-app' }}
328328
run: |
329329
git config --global user.name "github-actions[bot]"
330330
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
331331
332-
git clone --branch=apk https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} apk
333-
cd apk
332+
git clone --branch=app https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} app
333+
cd app
334334
335335
branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
336336
@@ -344,14 +344,14 @@ jobs:
344344
cp -v ../*.deb .
345345
cp -v ../*.rpm .
346346
347-
echo "Pushing to apk branch"
347+
echo "Pushing to app branch"
348348
349349
git checkout --orphan temporary
350350
git add --all .
351351
git commit -am "[Auto] Update Linux Packages from $branch ($(date +%Y-%m-%d.%H:%M:%S))"
352-
git branch -D apk
353-
git branch -m apk
354-
git push --force origin apk
352+
git branch -D app
353+
git branch -m app
354+
git push --force origin app
355355
356356
linux-arm64:
357357
name: Linux ARM64 Flutter Build
@@ -365,15 +365,15 @@ jobs:
365365
with:
366366
VERSION_NAME: ${{needs.common.outputs.VERSION_NAME}}
367367
VERSION_CODE: ${{needs.common.outputs.VERSION_CODE}}
368-
369-
- name: Upload packages to apk branch
368+
369+
- name: Upload packages to app branch
370370
if: ${{ github.repository == 'fossasia/pslab-app' }}
371371
run: |
372372
git config --global user.name "github-actions[bot]"
373373
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
374374
375-
git clone --branch=apk https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} apk
376-
cd apk
375+
git clone --branch=app https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} app
376+
cd app
377377
378378
branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
379379
@@ -386,14 +386,14 @@ jobs:
386386
cp -v ../*.deb .
387387
cp -v ../*.rpm .
388388
389-
echo "Pushing to apk branch"
389+
echo "Pushing to app branch"
390390
391391
git checkout --orphan temporary
392392
git add --all .
393393
git commit -am "[Auto] Update Linux ARM64 Packages from $branch ($(date +%Y-%m-%d.%H:%M:%S))"
394-
git branch -D apk
395-
git branch -m apk
396-
git push --force origin apk
394+
git branch -D app
395+
git branch -m app
396+
git push --force origin app
397397
398398
macos:
399399
name: macOS Flutter Build
@@ -407,15 +407,15 @@ jobs:
407407
with:
408408
VERSION_NAME: ${{needs.common.outputs.VERSION_NAME}}
409409
VERSION_CODE: ${{needs.common.outputs.VERSION_CODE}}
410-
411-
- name: Upload dmg to apk branch
410+
411+
- name: Upload dmg to app branch
412412
if: ${{ github.repository == 'fossasia/pslab-app' }}
413413
run: |
414414
git config --global user.name "github-actions[bot]"
415415
git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
416416
417-
git clone --branch=apk https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} apk
418-
cd apk
417+
git clone --branch=app https://${{ github.repository_owner }}:${{ github.token }}@github.com/${{ github.repository }} app
418+
cd app
419419
420420
branch=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
421421
@@ -427,11 +427,11 @@ jobs:
427427
428428
cp -v ../*.dmg .
429429
430-
echo "Pushing to apk branch"
430+
echo "Pushing to app branch"
431431
432432
git checkout --orphan temporary
433433
git add --all .
434434
git commit -am "[Auto] Update macOS DMG from $branch ($(date +%Y-%m-%d.%H:%M:%S))"
435-
git branch -D apk
436-
git branch -m apk
437-
git push --force origin apk
435+
git branch -D app
436+
git branch -m app
437+
git push --force origin app

0 commit comments

Comments
 (0)