From fc6e1c650b9297b84b8cdb051b9a1aee0e9d9ca6 Mon Sep 17 00:00:00 2001
From: Arya Massarat <23412689+aryarm@users.noreply.github.com>
Date: Sat, 8 Jul 2023 07:11:48 -0700
Subject: [PATCH 1/3] add nodefaults to variant_calling

---
 variant_calling.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/variant_calling.yml b/variant_calling.yml
index b57d147..422bb12 100644
--- a/variant_calling.yml
+++ b/variant_calling.yml
@@ -2,6 +2,7 @@ name: variant_calling
 channels:
   - conda-forge
   - bioconda
+  - nodefaults
 dependencies:
   - bioconda::samtools==1.15
   - bioconda::bcftools==1.15
@@ -11,4 +12,3 @@ dependencies:
   - conda-forge::r-reshape2==1.4.4
   - conda-forge::r-irkernel==1.3.2
   - conda-forge::ipykernel==6.22.0
-

From 64dd488ca4e85d0404ecd93b7d4f228aaadf942a Mon Sep 17 00:00:00 2001
From: Arya Massarat <23412689+aryarm@users.noreply.github.com>
Date: Mon, 2 Oct 2023 14:31:33 -0700
Subject: [PATCH 2/3] rename master to main in CI

---
 .github/workflows/docker-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index e00007f..4e8371a 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -8,7 +8,7 @@ name: Docker
 
 on:
   push:
-    branches: [ "master", "*" ]
+    branches: [ "main", "*" ]
     # Publish semver tags as releases.
     tags: [ 'v*.*.*' ]
     paths-ignore:

From 11e702e0992d1ce9417de575aafc6b67cd56ec5a Mon Sep 17 00:00:00 2001
From: Arya Massarat <23412689+aryarm@users.noreply.github.com>
Date: Fri, 6 Oct 2023 12:46:47 -0700
Subject: [PATCH 3/3] rename main back to master

---
 .github/workflows/docker-image.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 4e8371a..e00007f 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -8,7 +8,7 @@ name: Docker
 
 on:
   push:
-    branches: [ "main", "*" ]
+    branches: [ "master", "*" ]
     # Publish semver tags as releases.
     tags: [ 'v*.*.*' ]
     paths-ignore: