Skip to content

Commit f301b72

Browse files
Hard code 'main'
GitHub does not allow environments in tenors in conditions, causing `publish-oci` to get skipped Closes #2
1 parent 34785f3 commit f301b72

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

.github/workflows/flatpak.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ name: Flatpak
44
on:
55
push:
66
branches:
7-
- main # (change if needed)
7+
- main
88
workflow_dispatch:
99

1010
env:
@@ -14,7 +14,6 @@ env:
1414
IMAGE_TAG: # Tag of image
1515
FLATPAK_BUNDLE: # Name of bundle (excl. .flatpak)
1616
FLATPAK_BRANCH: # Flatpak branch
17-
UPSTREAM_BRANCH: main # Upstream branch (change if needed)
1817
FLATPAK_BUILD_DIR: build-dir
1918
FLATPAK_BUILD_REPO: build-repo
2019

@@ -98,7 +97,7 @@ jobs:
9897
path: ${{ env.FLATPAK_BUNDLE }}.flatpak
9998

10099
publish-oci:
101-
if: github.ref == 'refs/heads/${UPSTREAM_BRANCH}'
100+
if: github.ref == 'refs/heads/main'
102101
runs-on: ubuntu-latest
103102
needs: build
104103

.github/workflows/update.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ on:
66

77
env:
88
MANIFEST_PATH: # Path to manifest
9-
UPSTREAM_BRANCH: main # Upstream branch (change if needed)
109
REPO: # link to project repository (optional)
1110

1211
jobs:
@@ -26,8 +25,8 @@ jobs:
2625
GITHUB_TOKEN: ${{ secrets.PAT }}
2726
run: |
2827
set -x
29-
git clone -b ${UPSTREAM_BRANCH} https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git ${UPSTREAM_BRANCH}
30-
cd ${UPSTREAM_BRANCH}
28+
git clone -b main https://${GITHUB_ACTOR}:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git main
29+
cd main
3130
git config user.email "github-actions[bot]@users.noreply.github.com"
3231
git config user.name "github-actions[bot]"
3332
/app/flatpak-external-data-checker --update --commit-only ${MANIFEST_PATH}
@@ -36,5 +35,5 @@ jobs:
3635
continue-on-error: true
3736
run: |
3837
set -x
39-
cd ${UPSTREAM_BRANCH}
40-
git push origin HEAD:${UPSTREAM_BRANCH}
38+
cd main
39+
git push origin HEAD:main

0 commit comments

Comments
 (0)