Skip to content

Commit

Permalink
Update to dev branch
Browse files Browse the repository at this point in the history
This also synchronizes the manifest with tdesktop
  • Loading branch information
ilya-fedin committed Jul 1, 2024
1 parent fef6ee9 commit 1a7a2eb
Show file tree
Hide file tree
Showing 11 changed files with 439 additions and 212 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/beta-merger.yml
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
27 changes: 27 additions & 0 deletions .github/workflows/qt-patches-updater.yml
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)
2 changes: 1 addition & 1 deletion desktop-app-patches
6 changes: 0 additions & 6 deletions desktop-app-patches-qt5compat_6_2_3.json

This file was deleted.

53 changes: 0 additions & 53 deletions desktop-app-patches-qtbase_6_2_3.json

This file was deleted.

8 changes: 0 additions & 8 deletions desktop-app-patches-qtwayland_6_2_3.json

This file was deleted.

13 changes: 0 additions & 13 deletions dispatch-no-werror.patch

This file was deleted.

Loading

0 comments on commit 1a7a2eb

Please sign in to comment.