mirror of
https://github.com/cryptomator/cryptomator.git
synced 2026-05-17 18:21:26 +00:00
Merge pull request #2073 from cryptomator/feature/dedup-freedesktop-metadata
Deduplicate Freedesktop Metadata
This commit is contained in:
Sebastian Stenzel
GitHub
70
.github/workflows/release.yml
vendored
70
.github/workflows/release.yml
vendored
@@ -199,10 +199,10 @@ jobs:
|
||||
if-no-files-found: error
|
||||
|
||||
#
|
||||
# Linux PPA Source Package
|
||||
# Debian Package
|
||||
#
|
||||
ppa:
|
||||
name: Upload source package to PPA
|
||||
deb:
|
||||
name: Create Debian Package
|
||||
needs: [buildkit, metadata]
|
||||
runs-on: ubuntu-18.04
|
||||
steps:
|
||||
@@ -210,26 +210,26 @@ jobs:
|
||||
- name: install build tools
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install debhelper devscripts dput
|
||||
sudo apt-get install debhelper devscripts
|
||||
- name: Download linux-buildkit
|
||||
uses: actions/download-artifact@v2
|
||||
with:
|
||||
name: linux-buildkit
|
||||
path: pkgdir
|
||||
- name: create orig.tar.gz
|
||||
run: tar -cJf cryptomator_${{ needs.metadata.outputs.ppaVerStr }}.orig.tar.xz -C pkgdir .
|
||||
- name: create orig.tar.gz with common/ libs/ mods/
|
||||
run: |
|
||||
cp -r dist/linux/common/ pkgdir
|
||||
tar -cJf cryptomator_${{ needs.metadata.outputs.ppaVerStr }}.orig.tar.xz -C pkgdir .
|
||||
- name: patch and rename pkgdir
|
||||
run: |
|
||||
cp -r dist/linux/debian/ pkgdir
|
||||
cp -r dist/linux/resources/ pkgdir
|
||||
export RFC2822_TIMESTAMP=`date --rfc-2822`
|
||||
envsubst '${VERSION_STR} ${VERSION_NUM} ${REVISION_NUM}' < dist/linux/debian/rules > pkgdir/debian/rules
|
||||
envsubst '${VERSION_STR}' < dist/linux/debian/org.cryptomator.Cryptomator.desktop > pkgdir/debian/org.cryptomator.Cryptomator.desktop
|
||||
envsubst '${SEMVER_STR} ${VERSION_NUM} ${REVISION_NUM}' < dist/linux/debian/rules > pkgdir/debian/rules
|
||||
envsubst '${PPA_VERSION} ${RFC2822_TIMESTAMP}' < dist/linux/debian/changelog > pkgdir/debian/changelog
|
||||
find . -name "*.jar" >> pkgdir/debian/source/include-binaries
|
||||
mv pkgdir cryptomator_${{ needs.metadata.outputs.ppaVerStr }}
|
||||
env:
|
||||
VERSION_STR: ${{ needs.metadata.outputs.semVerStr }}
|
||||
SEMVER_STR: ${{ needs.metadata.outputs.semVerStr }}
|
||||
VERSION_NUM: ${{ needs.metadata.outputs.semVerNum }}
|
||||
REVISION_NUM: ${{ needs.metadata.outputs.revNum }}
|
||||
PPA_VERSION: ${{ needs.metadata.outputs.ppaVerStr }}-0ppa1
|
||||
@@ -241,7 +241,9 @@ jobs:
|
||||
GPG_PRIVATE_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
|
||||
GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
|
||||
- name: debuild
|
||||
run: debuild -S -sa -d
|
||||
run: |
|
||||
debuild -S -sa -d
|
||||
debuild -b -sa -d
|
||||
env:
|
||||
DEBSIGN_PROGRAM: gpg --batch --pinentry-mode loopback
|
||||
DEBSIGN_KEYID: 615D449FE6E6A235
|
||||
@@ -249,17 +251,38 @@ jobs:
|
||||
- name: Upload artifacts
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: linux-deb-source-package
|
||||
name: linux-deb-package
|
||||
path: |
|
||||
cryptomator_*.dsc
|
||||
cryptomator_*.orig.tar.xz
|
||||
cryptomator_*.debian.tar.xz
|
||||
cryptomator_*_source.changes
|
||||
cryptomator_*_source.buildinfo
|
||||
- name: dput to beta repo
|
||||
run: dput ppa:sebastian-stenzel/cryptomator-beta cryptomator_${PPA_VERSION}_source.changes
|
||||
cryptomator_*_source.changes
|
||||
cryptomator_*_amd64.deb
|
||||
|
||||
#
|
||||
# Upload Source Package to PPA
|
||||
#
|
||||
ppa:
|
||||
name: Upload Source Package to PPA
|
||||
needs: [deb]
|
||||
runs-on: ubuntu-18.04
|
||||
steps:
|
||||
- name: install dput
|
||||
run: |
|
||||
sudo apt-get update
|
||||
sudo apt-get install dput
|
||||
- name: import public key
|
||||
run: curl -sSL ${GPG_PUBLIC_KEY_URL} | gpg --import -
|
||||
env:
|
||||
PPA_VERSION: ${{ needs.metadata.outputs.ppaVerStr }}-0ppa1
|
||||
GPG_PUBLIC_KEY_URL: https://gist.githubusercontent.com/cryptobot/211111cf092037490275f39d408f461a/raw/E6E6A235.asc
|
||||
- name: download linux-deb-package
|
||||
uses: actions/download-artifact@v2
|
||||
with:
|
||||
name: linux-deb-package
|
||||
path: .
|
||||
- name: dput to beta repo
|
||||
run: dput ppa:sebastian-stenzel/cryptomator-beta cryptomator_*_source.changes
|
||||
|
||||
#
|
||||
# Linux Cryptomator.AppImage
|
||||
@@ -282,6 +305,12 @@ jobs:
|
||||
mv appdir/Cryptomator Cryptomator.AppDir
|
||||
cp -r dist/linux/appimage/resources/AppDir/* Cryptomator.AppDir/
|
||||
envsubst '${REVISION_NO} ${SEMVER_STR}' < dist/linux/appimage/resources/AppDir/bin/cryptomator.sh > Cryptomator.AppDir/bin/cryptomator.sh
|
||||
cp dist/linux/common/org.cryptomator.Cryptomator256.png Cryptomator.AppDir/usr/share/icons/hicolor/256x256/apps/org.cryptomator.Cryptomator.png
|
||||
cp dist/linux/common/org.cryptomator.Cryptomator512.png Cryptomator.AppDir/usr/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.png
|
||||
cp dist/linux/common/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg
|
||||
cp dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml Cryptomator.AppDir/usr/share/metainfo/org.cryptomator.Cryptomator.metainfo.xml
|
||||
cp dist/linux/common/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/usr/share/applications/org.cryptomator.Cryptomator.desktop
|
||||
cp dist/linux/common/application-vnd.cryptomator.vault.xml Cryptomator.AppDir/usr/share/mime/packages/application-vnd.cryptomator.vault.xml
|
||||
ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/org.cryptomator.Cryptomator.svg
|
||||
ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/Cryptomator.svg
|
||||
ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/.DirIcon
|
||||
@@ -642,6 +671,10 @@ jobs:
|
||||
- uses: actions/checkout@v2
|
||||
- name: Create tarball
|
||||
run: git archive --prefix="cryptomator-${{ needs.metadata.outputs.semVerStr }}/" -o "cryptomator-${{ needs.metadata.outputs.semVerStr }}.tar.gz" ${{ github.ref }}
|
||||
- name: Download Debian package
|
||||
uses: actions/download-artifact@v2
|
||||
with:
|
||||
name: linux-deb-package
|
||||
- name: Download linux appimage
|
||||
uses: actions/download-artifact@v2
|
||||
with:
|
||||
@@ -661,7 +694,7 @@ jobs:
|
||||
- name: Create detached GPG signature for all release files with key 615D449FE6E6A235
|
||||
run: |
|
||||
echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
|
||||
for FILE in `find . -name "*.AppImage" -o -name "*.dmg" -o -name "*.msi" -o -name "*.exe" -o -name "*.zsync" -o -name "*.tar.gz"`; do
|
||||
for FILE in `find . -name "*.AppImage" -o -name "*.deb" -o -name "*.dmg" -o -name "*.exe" -o -name "*.msi" -o -name "*.zsync" -o -name "*.tar.gz"`; do
|
||||
echo "${GPG_PASSPHRASE}" | gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a ${FILE}
|
||||
done
|
||||
env:
|
||||
@@ -669,7 +702,7 @@ jobs:
|
||||
GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
|
||||
- name: Compute SHA256 checksums of release artifacts
|
||||
run: |
|
||||
SHA256_SUMS=`find . -name "*.AppImage" -o -name "*.dmg" -o -name "*.msi" -o -name "*.exe" -o -name "*.tar.gz" | xargs sha256sum`
|
||||
SHA256_SUMS=`find . -name "*.AppImage" -o -name "*.deb" -o -name "*.dmg" -o -name "*.exe" -o -name "*.msi" -o -name "*.tar.gz" | xargs sha256sum`
|
||||
echo "SHA256_SUMS<<EOF" >> $GITHUB_ENV
|
||||
echo "${SHA256_SUMS}" >> $GITHUB_ENV
|
||||
echo "EOF" >> $GITHUB_ENV
|
||||
@@ -685,6 +718,7 @@ jobs:
|
||||
*.AppImage
|
||||
*.zsync
|
||||
*.asc
|
||||
*.deb
|
||||
*.dmg
|
||||
*.msi
|
||||
*.exe
|
||||
|
||||
Reference in New Issue
Block a user