From 0abdef13523c18471e6e4d7fbe65471569312e17 Mon Sep 17 00:00:00 2001 From: mickael e Date: Wed, 15 Jul 2020 09:22:03 -0400 Subject: [PATCH 1/3] Use new default branch for nightly CI builds --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index ab814845..01aa71ea 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -546,7 +546,7 @@ workflows: filters: branches: only: - - master + - main jobs: - build-nightly-buster-securedrop-client - build-nightly-buster-securedrop-proxy: From 98c696678a402eb9dc174a8e964c3d67a7237911 Mon Sep 17 00:00:00 2001 From: mickael e Date: Wed, 15 Jul 2020 09:37:31 -0400 Subject: [PATCH 2/3] Use new default branches for dev LFS repos --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 01aa71ea..65740387 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -246,7 +246,7 @@ common-steps: cp ~/debbuild/packaging/*.deb ./workstation/${PLATFORM}/ git add workstation/${PLATFORM}/*.deb git commit -m "Automated SecureDrop workstation build" - git push origin master + git push origin main - &sign_rpm run: @@ -269,7 +269,7 @@ common-steps: git add workstation/dom0/f25/*.rpm git commit -m "Automated SecureDrop workstation build" - git push origin master + git push origin main - &buildrpm run: From 60103459b65d2b54c5674bb22e6c0fa9682f796d Mon Sep 17 00:00:00 2001 From: mickael e Date: Wed, 15 Jul 2020 09:39:19 -0400 Subject: [PATCH 3/3] Update references to default branch --- README.md | 4 ++-- devops/ci-sign-rpm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 53b41c7c..6f3a0aae 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # SecureDrop Debian Packaging -[![CircleCI](https://circleci.com/gh/freedomofpress/securedrop-debian-packaging/tree/master.svg?style=svg)](https://circleci.com/gh/freedomofpress/securedrop-debian-packaging/tree/master) +[![CircleCI](https://circleci.com/gh/freedomofpress/securedrop-debian-packaging/tree/main.svg?style=svg)](https://circleci.com/gh/freedomofpress/securedrop-debian-packaging/tree/main) This repository contains the packaging files and tooling for building Debian packages for projects for the alpha [SecureDrop Workstation](https://github.com/freedomofpress/securedrop-workstation) based on Qubes OS. Packages are placed on `apt-test-qubes.freedom.press` for installation in Debian-based TemplateVMs. These packages are not yet ready for use in a production environment. @@ -32,7 +32,7 @@ binary wheel files. Maintainers of `securedrop-client` and `securedrop-proxy` must ensure that the requirements files which are used for build of these packages (`build-requirements.txt`) -using `make requirements` are kept up to date in latest `master` of those repositories. +using `make requirements` are kept up to date in latest `main` of those repositories. If new dependencies were added in the `requirements.txt` of that repo that are not in the FPF PyPI mirror (https://pypi.securedrop.org/), then the maintainer needs diff --git a/devops/ci-sign-rpm b/devops/ci-sign-rpm index e274a1b7..6c239855 100755 --- a/devops/ci-sign-rpm +++ b/devops/ci-sign-rpm @@ -1,7 +1,7 @@ set -u set -e -# Same version as: https://github.com/freedomofpress/securedrop-workstation/blob/master/scripts/build-dom0-rpm#L10 +# Same version as: https://github.com/freedomofpress/securedrop-workstation/blob/main/scripts/build-dom0-rpm#L10 export FEDORA_PKGR_VER=0.6.0.1-1.fc25 export USER_RPMDIR="/home/circleci/packaging/securedrop-workstation/rpm-build" export CI_DEVOPS_FOLDER="/home/circleci/project/devops"