CringeStudios/element-desktop
5
0
Fork 0
mirror of https://github.com/CringeStudios/element-desktop.git synced 2025-01-19 07:54:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #153 from vector-im/jryans/rebrand-packaged-artifact

Browse Source 
Update branding of packaging artifacts
This commit is contained in:
J. Ryan Stinnett 2020-11-25 11:16:57 +00:00 committed by GitHub
commit 239bab38ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -7,7 +7,7 @@
"author": "Element", "author": "Element",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/vector-im/riot-desktop" "url": "https://github.com/vector-im/element-desktop"
}, },
"license": "Apache-2.0", "license": "Apache-2.0",
"files": [], "files": [],
@ -21,7 +21,7 @@
"build32": "electron-builder --ia32", "build32": "electron-builder --ia32",
"build64": "electron-builder --x64", "build64": "electron-builder --x64",
"build": "electron-builder", "build": "electron-builder",
"docker:setup": "docker build -t riot-desktop-dockerbuild dockerbuild", "docker:setup": "docker build -t element-desktop-dockerbuild dockerbuild",
"docker:build:native": "scripts/in-docker.sh yarn run hak", "docker:build:native": "scripts/in-docker.sh yarn run hak",
"docker:build": "scripts/in-docker.sh yarn run build", "docker:build": "scripts/in-docker.sh yarn run build",
"docker:install": "scripts/in-docker.sh yarn install", "docker:install": "scripts/in-docker.sh yarn install",

8
scripts/fetch-package.js
View File

@ -11,7 +11,7 @@ const needle = require('needle');
const riotDesktopPackageJson = require('../package.json'); const riotDesktopPackageJson = require('../package.json');
const PUB_KEY_URL = "https://packages.riot.im/riot-release-key.asc"; const PUB_KEY_URL = "https://packages.riot.im/element-release-key.asc";
const PACKAGE_URL_PREFIX = "https://github.com/vector-im/element-web/releases/download/"; const PACKAGE_URL_PREFIX = "https://github.com/vector-im/element-web/releases/download/";
const ASAR_PATH = 'webapp.asar'; const ASAR_PATH = 'webapp.asar';
@ -55,7 +55,7 @@ async function getLatestDevelopUrl(bkToken) {
let dlUrl; let dlUrl;
let dlFilename; let dlFilename;
for (const artifact of artifactsResult.body) { for (const artifact of artifactsResult.body) {
if (artifact.filename && /^riot-.*\.tar.gz$/.test(artifact.filename)) { if (artifact.filename && /^element-.*\.tar.gz$/.test(artifact.filename)) {
dlUrl = artifact.download_url; dlUrl = artifact.download_url;
dlFilename = artifact.filename; dlFilename = artifact.filename;
break; break;
@ -149,7 +149,7 @@ async function main() {
if (targetVersion === undefined) { if (targetVersion === undefined) {
targetVersion = 'v' + riotDesktopPackageJson.version; targetVersion = 'v' + riotDesktopPackageJson.version;
filename = 'riot-' + targetVersion + '.tar.gz'; filename = 'element-' + targetVersion + '.tar.gz';
url = PACKAGE_URL_PREFIX + targetVersion + '/' + filename; url = PACKAGE_URL_PREFIX + targetVersion + '/' + filename;
} else if (targetVersion === 'develop') { } else if (targetVersion === 'develop') {
const buildKiteApiKey = process.env.BUILDKITE_API_KEY; const buildKiteApiKey = process.env.BUILDKITE_API_KEY;
@ -164,7 +164,7 @@ async function main() {
[filename, url] = await getLatestDevelopUrl(buildKiteApiKey); [filename, url] = await getLatestDevelopUrl(buildKiteApiKey);
verify = false; // develop builds aren't signed verify = false; // develop builds aren't signed
} else { } else {
filename = 'riot-' + targetVersion + '.tar.gz'; filename = 'element-' + targetVersion + '.tar.gz';
url = PACKAGE_URL_PREFIX + targetVersion + '/' + filename; url = PACKAGE_URL_PREFIX + targetVersion + '/' + filename;
setVersion = true; setVersion = true;
} }

6
scripts/in-docker.sh
View File

@ -1,8 +1,8 @@
#!/bin/bash #!/bin/bash
docker inspect riot-desktop-dockerbuild 2> /dev/null > /dev/null docker inspect element-desktop-dockerbuild 2> /dev/null > /dev/null
if [ $? != 0 ]; then if [ $? != 0 ]; then
echo "Docker image riot-desktop-dockerbuild not found. Have you run yarn run docker:setup?" echo "Docker image element-desktop-dockerbuild not found. Have you run yarn run docker:setup?"
exit 1 exit 1
fi fi
@ -17,4 +17,4 @@ docker run --rm -ti \
-v ${PWD}/docker/.gnupg:/root/.gnupg \ -v ${PWD}/docker/.gnupg:/root/.gnupg \
-v ~/.cache/electron:/root/.cache/electron \ -v ~/.cache/electron:/root/.cache/electron \
-v ~/.cache/electron-builder:/root/.cache/electron-builder \ -v ~/.cache/electron-builder:/root/.cache/electron-builder \
riot-desktop-dockerbuild "$@" element-desktop-dockerbuild "$@"

4
scripts/mkrepo.sh
View File

@ -22,10 +22,10 @@ cp $confdir/conf_distributions $repodir/conf/distributions
pushd $repodir pushd $repodir
for i in `cat conf/distributions | grep Codename | cut -d ' ' -f 2` for i in `cat conf/distributions | grep Codename | cut -d ' ' -f 2`
do do
reprepro includedeb $i $distdir/riot-desktop_${ver}_amd64.deb reprepro includedeb $i $distdir/element-desktop_${ver}_amd64.deb
done done
tar cvzf $distdir/riot-desktop_repo_$ver.tar.gz . tar cvzf $distdir/element-desktop_repo_$ver.tar.gz .
popd popd