Merge pull request #4 from rformassspectrometry/jomain

Re-add alignment vignette
rformassspectrometry · Oct 14, 2024 · d8dde1f · d8dde1f
2 parents e6bef3a + 35ae934
commit d8dde1f
Show file tree

Hide file tree

Showing 3 changed files with 409 additions and 9 deletions.
diff --git a/.github/workflows/build_deploy.yaml b/.github/workflows/build_deploy.yaml
@@ -1,13 +1,13 @@
 name: pkgdown
 
-# on:
-#   push:
-#     branches:
-#     - jomain
-
 on:
-  repository_dispatch:
-    types: [trigger-workflow-2]
+  push:
+    branches:
+    - jomain
+
+# on:
+#   repository_dispatch:
+#     types: [trigger-workflow-2]
 
 jobs:
   build-and-deploy:
@@ -50,7 +50,6 @@ jobs:
           apt-get -y install rsync
 
       - name: Install pkgdown
-        if: github.ref == 'refs/heads/main'
         run: |
           install.packages('pkgdown')
         shell: Rscript {0}

diff --git a/.github/workflows/docker-push.yaml b/.github/workflows/docker-push.yaml
@@ -6,7 +6,6 @@ on:
   push:
     branches:
     - main
-    - jomain
 
 jobs:
   build-docker-and-push:
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,6 @@ on: @@
       push:
         branches:
         - main
-        - jomain
     jobs:
       build-docker-and-push:
@@ Expand Down @@