From b79cb5d1608c60ac2699b59cba42d17271159de2 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Thu, 25 May 2023 17:08:28 -0700 Subject: [PATCH] aptly.sh: Remove to put it closer to release scripts --- aptly.sh | 76 ---------------------------------------------------- package.json | 1 - 2 files changed, 77 deletions(-) delete mode 100755 aptly.sh diff --git a/aptly.sh b/aptly.sh deleted file mode 100755 index f7508e6744..0000000000 --- a/aptly.sh +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/bash -# Copyright 2017 Signal Messenger, LLC -# SPDX-License-Identifier: AGPL-3.0-only - -# First run on a machine - uncomment the two 'first run' sections below, comment out the 'later runs' section. -# -# Release: -# NAME=signal-desktop(-beta) VERSION=X.X.X ./aptly.sh - -set -e -set -u -set -o pipefail - -echo -echo "aptly.sh: Releasing $NAME build version $VERSION" - -REPO=signal-desktop -CURRENT=xenial -SNAPSHOT="signal-desktop_v$VERSION" -GPG_KEYID=57F6FB06 -APTLY_SOURCE=${APTLY_SOURCE:-desktop/apt} - -FIRST_RUN=false - -if [ ! -d ~/.aptly/public ] ; then - echo - echo "aptly.sh: Detected first run, creating repo" - aptly repo create signal-desktop - FIRST_RUN=true -fi - -if [ "${DISABLE_APTLY_DOWNLOAD}" != "true" ] ; then - echo - echo "aptly.sh: Fetching latest released files so we don't erase anything" - - if ! aptly mirror show backfill-mirror; then - echo "aptly.sh: No existing mirror, setting it up" - aptly mirror create -ignore-signatures backfill-mirror "https://updates.signal.org/$APTLY_SOURCE" xenial - else - echo "aptly.sh: Mirror is already in place" - fi - - echo "aptly.sh: Updating mirror" - aptly mirror update -ignore-signatures backfill-mirror - - echo "aptly.sh: Importing existing releases" - aptly repo import backfill-mirror signal-desktop signal-desktop signal-desktop-beta -fi - -echo -echo "aptly.sh: Adding newly-built deb to repo" -aptly repo add "$REPO" release/"$NAME"_"$VERSION"_*.deb - -echo -echo "aptly.sh: Creating a snapshot from the current state of the repo" -aptly snapshot create "$SNAPSHOT" from repo "$REPO" - -if [ "$FIRST_RUN" = true ] ; then - # https://www.aptly.info/doc/aptly/publish/snapshot/ - echo - echo "aptly.sh: (first run) Setting up local publish with current snapshot" - aptly publish snapshot -passphrase-file=gpg-passphrase.txt -batch=true -gpg-key="$GPG_KEYID" -distribution="$CURRENT" "$SNAPSHOT" -else - # https://www.aptly.info/doc/aptly/publish/switch/ - echo - echo "aptly.sh: (later runs) Switching local publish to current snapshot" - aptly publish switch -passphrase-file=gpg-passphrase.txt -batch=true -gpg-key="$GPG_KEYID" "$CURRENT" "$SNAPSHOT" -fi - -echo -echo "aptly.sh: Syncing local publish to s3" -aws s3 sync ~/.aptly/public/pool/ "s3://updates.signal.org/$APTLY_SOURCE/pool/" -aws s3 sync ~/.aptly/public/dists/ "s3://updates.signal.org/$APTLY_SOURCE/dists/" - -echo -echo "aptly.sh: Complete!" diff --git a/package.json b/package.json index a0664e7abc..615415e121 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,6 @@ "prepare-alpha-version": "node scripts/prepare_alpha_version.js", "prepare-staging-build": "node scripts/prepare_staging_build.js", "prepare-windows-cert": "node scripts/prepare_windows_cert.js", - "publish-to-apt": "NAME=$npm_package_name VERSION=$npm_package_version ./aptly.sh", "test": "yarn test-node && yarn test-electron && yarn test-lint-intl && yarn test-eslint", "test-electron": "node ts/scripts/test-electron.js", "test-release": "node ts/scripts/test-release.js",