From 0c68145a4358cc211d6ed4cb385db021626eb031 Mon Sep 17 00:00:00 2001 From: Christine Dodrill Date: Sun, 11 Oct 2020 10:12:01 -0400 Subject: [PATCH] rename master to main --- .github/workflows/nix.yml | 6 ++---- .github/workflows/rust.yml | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index 143dd86..d9c6616 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -2,10 +2,10 @@ name: "Nix" on: push: branches: - - master + - main pull_request: branches: - - master + - main jobs: docker-build: runs-on: ubuntu-latest @@ -15,8 +15,6 @@ jobs: - uses: cachix/cachix-action@v3 with: name: xe - signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}' - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - name: Log into GitHub Container Registry run: echo "${{ secrets.CR_PAT }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin - name: Docker push diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 1e18d23..0140999 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -1,9 +1,9 @@ name: Rust on: push: - branches: [ master ] + branches: [ main ] pull_request: - branches: [ master ] + branches: [ main ] env: CARGO_TERM_COLOR: always jobs: