Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update default branches for LFS repos #177

Merged
merged 3 commits into from
Jul 20, 2020
+6 −6
Merged

Update default branches for LFS repos #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0abdef1
Use new default branch for nightly CI builds
emkll Jul 15, 2020
98c6966
Use new default branches for dev LFS repos
emkll Jul 15, 2020
6010345
Update references to default branch
emkll Jul 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -546,7 +546,7 @@ workflows:
filters:
branches:
only:
- master
- main
jobs:
- build-nightly-buster-securedrop-client
- build-nightly-buster-securedrop-proxy:
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion devops/ci-sign-rpm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down