Merge branch 'main' into lintlintlint
This commit is contained in:
commit
606f169438
3 changed files with 75 additions and 22 deletions
14
.github/workflows/release.yml
vendored
14
.github/workflows/release.yml
vendored
|
@ -26,3 +26,17 @@ jobs:
|
||||||
with:
|
with:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
RELEASE: true
|
RELEASE: true
|
||||||
|
|
||||||
|
- name: Update AUR package
|
||||||
|
if: ${{ matrix.os == 'ubuntu-latest' }}
|
||||||
|
run: |
|
||||||
|
sudo apt install makepkg
|
||||||
|
|
||||||
|
echo $SSH_KEY > ~/.ssh/aur
|
||||||
|
echo $SSH_PUB_KEY > ~/.ssh/aur.pub
|
||||||
|
export GIT_SSH_COMMAND="ssh -i ~/.ssh/aur"
|
||||||
|
|
||||||
|
./scripts/aur_bump.sh
|
||||||
|
with:
|
||||||
|
SSH_KEY: ${{ secrets.AUR_SSH_KEY }}
|
||||||
|
SSH_PUB_KEY: ${{ secrets.AUR_SSH_PUB_KEY }}
|
||||||
|
|
20
scripts/aur_bump.sh
Executable file
20
scripts/aur_bump.sh
Executable file
|
@ -0,0 +1,20 @@
|
||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
VERSION=$(git describe --tags --abbrev=0 | tr -d 'v')
|
||||||
|
SHASUM=$(sha256sum "dist/VencordDesktop-$VERSION.tar.gz" | awk '{ print $1 }')
|
||||||
|
|
||||||
|
git clone ssh://aur@aur.archlinux.org/vencord-desktop-bin.git aurpkg
|
||||||
|
|
||||||
|
cd aurpkg
|
||||||
|
|
||||||
|
sed -i "s/^pkgver=.*$/pkgver=$VERSION/" PKGBUILD
|
||||||
|
sed -i "s/^sha256sums=('.*'/sha256sums=('$SHASUM'/" PKGBUILD
|
||||||
|
makepkg --printsrcinfo > .SRCINFO
|
||||||
|
|
||||||
|
git commit -a -m "Bump version to $VERSION"
|
||||||
|
git push
|
||||||
|
|
||||||
|
cd ..
|
||||||
|
rm -rf aurpkg
|
|
@ -1,29 +1,48 @@
|
||||||
<head>
|
<head>
|
||||||
<style>
|
<style>
|
||||||
body {
|
* {
|
||||||
margin: 0;
|
user-select: none;
|
||||||
padding: 0;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.wrapper {
|
body {
|
||||||
height: 100%;
|
font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell,
|
||||||
display: flex;
|
"Open Sans", "Helvetica Neue", sans-serif;
|
||||||
justify-content: center;
|
margin: 0;
|
||||||
align-items: center;
|
padding: 0;
|
||||||
background-color: hsl(223 6.7% 20.6%);
|
}
|
||||||
border-radius: 6px;
|
|
||||||
}
|
|
||||||
|
|
||||||
p {
|
.wrapper {
|
||||||
color: white;
|
box-sizing: border-box;
|
||||||
font-family: system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell,
|
height: 100%;
|
||||||
"Open Sans", "Helvetica Neue", sans-serif;
|
display: flex;
|
||||||
}
|
flex-direction: column;
|
||||||
</style>
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
background-color: hsl(223 6.7% 20.6%);
|
||||||
|
border-radius: 8px;
|
||||||
|
border: 1px solid hsl(220 6.5% 18%);
|
||||||
|
}
|
||||||
|
|
||||||
|
p {
|
||||||
|
color: rgb(219, 222, 225);
|
||||||
|
text-align: center;
|
||||||
|
}
|
||||||
|
|
||||||
|
img {
|
||||||
|
width: 6em;
|
||||||
|
height: 6em;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div class="wrapper">
|
<div class="wrapper">
|
||||||
<p>Loading...</p>
|
<img
|
||||||
</div>
|
draggable="false"
|
||||||
|
src="https://cdn.discordapp.com/emojis/1024751291504791654.gif?size=512"
|
||||||
|
alt="shiggy"
|
||||||
|
role="presentation"
|
||||||
|
/>
|
||||||
|
<p>Loading Vencord Desktop...</p>
|
||||||
|
</div>
|
||||||
</body>
|
</body>
|
||||||
|
|
Reference in a new issue