-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
This also synchronizes the manifest with tdesktop
- Loading branch information
1 parent
fef6ee9
commit 1a7a2eb
Showing
11 changed files
with
439 additions
and
212 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
name: Merge beta branch | ||
on: | ||
push: | ||
branches: | ||
- beta | ||
jobs: | ||
merge-beta: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/checkout@v3 | ||
with: | ||
fetch-depth: 0 | ||
- name: Merge beta branch | ||
run: | | ||
url=$(yq '.modules[-1].sources[0]."x-checker-data".url' io.github.kotatogram.yml) | ||
version=$(yq '.modules[-1].sources[0].tag' io.github.kotatogra.yml) | ||
prerelease=$(curl -sSL "$url" | jq --arg version "$version" '.[] | select(.tag_name == $version).prerelease') | ||
if [ "$prerelease" != false ]; then | ||
exit | ||
fi | ||
git config --global user.name 'GitHub Action' | ||
git config --global user.email 'action@github.com' | ||
git checkout master | ||
git merge beta | ||
git push |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
name: Update Qt patches | ||
on: pull_request | ||
jobs: | ||
update-qt-patches: | ||
runs-on: ubuntu-latest | ||
if: github.event.pull_request.user.login == 'flathubbot' | ||
steps: | ||
- uses: actions/checkout@v3 | ||
with: | ||
ref: ${{ github.event.pull_request.head.ref }} | ||
submodules: true | ||
- name: Update Qt patches | ||
run: | | ||
QT=$(yq '.modules[] | select(.name == "qtbase").sources[0].url' io.github.kotatogram.yml | sed -r 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/') | ||
pushd desktop-app-patches > /dev/null | ||
repo=$(git remote get-url origin | sed -r 's@^https://github.com/(.*)\.git$@\1@') | ||
git fetch | ||
git checkout origin/master | ||
commit=$(git rev-parse --short HEAD) | ||
popd > /dev/null | ||
for i in desktop-app-patches/*_${QT}; do | ||
./gen-patchset.py -o $(basename $i | sed -r "s/_${QT}//").json $i | ||
done | ||
git config --global user.name 'GitHub Action' | ||
git config --global user.email 'action@github.com' | ||
git add . | ||
git diff --staged --quiet || (git commit -m "Update Qt patches to $repo@$commit" && git push) |
Submodule desktop-app-patches
updated
185 files
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.