diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml index e3550c6..4cb8d2e 100644 --- a/.github/workflows/nix.yml +++ b/.github/workflows/nix.yml @@ -2,7 +2,7 @@ name: Nix on: push: branches: - - master + - main pull_request: workflow_dispatch: schedule: diff --git a/ci-manifests.sh b/ci-manifests.sh index 852f838..4794539 100755 --- a/ci-manifests.sh +++ b/ci-manifests.sh @@ -25,8 +25,8 @@ banner() { cd "$(dirname "$0")" -if [[ $(git rev-parse --abbrev-ref HEAD) != master ]]; then - banner "Skipping push on non-master branch" +if [[ $(git rev-parse --abbrev-ref HEAD) != main ]]; then + banner "Skipping push on non-main branch" exit fi diff --git a/ci.sh b/ci.sh index d93bbef..6c52101 100755 --- a/ci.sh +++ b/ci.sh @@ -33,8 +33,8 @@ nix-build \ --option sandbox true \ --argstr system "$system_name" -if [[ $(git rev-parse --abbrev-ref HEAD) != master ]]; then - banner "Skipping push on non-master branch" +if [[ $(git rev-parse --abbrev-ref HEAD) != main ]]; then + banner "Skipping push on non-main branch" exit fi diff --git a/images/devcontainer/default.nix b/images/devcontainer/default.nix index c3127a0..bf60d14 100644 --- a/images/devcontainer/default.nix +++ b/images/devcontainer/default.nix @@ -130,7 +130,7 @@ let ]; Labels = { # https://github.com/microscaling/microscaling/blob/55a2d7b91ce7513e07f8b1fd91bbed8df59aed5a/Dockerfile#L22-L33 - "org.label-schema.vcs-ref" = "master"; + "org.label-schema.vcs-ref" = "main"; "org.label-schema.vcs-url" = "https://github.com/nix-community/docker-nixpkgs"; }; }; diff --git a/lib/buildCLIImage.nix b/lib/buildCLIImage.nix index 454e43d..ba44ed7 100644 --- a/lib/buildCLIImage.nix +++ b/lib/buildCLIImage.nix @@ -28,7 +28,7 @@ let ]; Labels = { # https://github.com/microscaling/microscaling/blob/55a2d7b91ce7513e07f8b1fd91bbed8df59aed5a/Dockerfile#L22-L33 - "org.label-schema.vcs-ref" = "master"; + "org.label-schema.vcs-ref" = "main"; "org.label-schema.vcs-url" = "https://github.com/nix-community/docker-nixpkgs"; }; };