rename master to main

This commit is contained in:
Cadey Ratio 2020-10-11 10:12:01 -04:00
parent 2671a67338
commit 0c68145a43
2 changed files with 4 additions and 6 deletions

View File

@ -2,10 +2,10 @@ name: "Nix"
on: on:
push: push:
branches: branches:
- master - main
pull_request: pull_request:
branches: branches:
- master - main
jobs: jobs:
docker-build: docker-build:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -15,8 +15,6 @@ jobs:
- uses: cachix/cachix-action@v3 - uses: cachix/cachix-action@v3
with: with:
name: xe name: xe
signingKey: '${{ secrets.CACHIX_SIGNING_KEY }}'
authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
- name: Log into GitHub Container Registry - name: Log into GitHub Container Registry
run: echo "${{ secrets.CR_PAT }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin run: echo "${{ secrets.CR_PAT }}" | docker login https://ghcr.io -u ${{ github.actor }} --password-stdin
- name: Docker push - name: Docker push

View File

@ -1,9 +1,9 @@
name: Rust name: Rust
on: on:
push: push:
branches: [ master ] branches: [ main ]
pull_request: pull_request:
branches: [ master ] branches: [ main ]
env: env:
CARGO_TERM_COLOR: always CARGO_TERM_COLOR: always
jobs: jobs: