Merge pull request #78 from bcbi/dpa/fix-build

Fix a broken build
JuliaContainerization · May 12, 2020 · 310b41b · 310b41b · DilumAluthge · May 12, 2020
2 parents 07a24fe + 25f071e
commit 310b41b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.github/workflows/predictmd.yml b/.github/workflows/predictmd.yml
@@ -33,13 +33,15 @@ jobs:
         env:
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: echo ${{ secrets.DOCKER_PASSWORD }} | docker --config ~/.dockerconfig1 login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
+      - if: github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event_name == 'schedule')
+        env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-         echo ${{ secrets.DOCKER_PASSWORD }} | docker --config ~/.dockerconfig1 login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
-         echo ${{ secrets.GITHUB_TOKEN }} | docker --config ~/.dockerconfig2 login docker.pkg.github.com -u bcbi --password-stdin
+        run: echo ${{ secrets.GITHUB_TOKEN }} | docker --config ~/.dockerconfig2 login docker.pkg.github.com -u bcbi --password-stdin
       - run: docker build -t dilumaluthge/predictmd -t docker.pkg.github.com/bcbi/simplecontainergenerator.jl/predictmd .
       - run: docker run dilumaluthge/predictmd "JULIA_DEBUG=all PREDICTMD_TEST_GROUP=all PREDICTMD_TEST_PLOTS=true /usr/bin/julia -e 'import Pkg; Pkg.test(string(:PredictMDExtra)); Pkg.test(string(:PredictMDFull)); Pkg.test(string(:PredictMD))'"
       - if: success() && github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event_name == 'schedule')
-        run: |
-         docker --config ~/.dockerconfig1 push dilumaluthge/predictmd
-         docker --config ~/.dockerconfig2 push docker.pkg.github.com/bcbi/simplecontainergenerator.jl/predictmd
+        run: docker --config ~/.dockerconfig1 push dilumaluthge/predictmd
+      - if: success() && github.ref == 'refs/heads/master' && (github.event_name == 'push' || github.event_name == 'schedule')
+        run: docker --config ~/.dockerconfig2 push docker.pkg.github.com/bcbi/simplecontainergenerator.jl/predictmd
+        continue-on-error: true
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "SimpleContainerGenerator"
 uuid = "b8d349fb-717b-4aac-a9b1-e1da4219c631"
 authors = ["Dilum Aluthge"]
-version = "1.1.0"
+version = "1.1.1"
 
 [deps]
 PackageCompiler = "9b87118b-4619-50d2-8e1e-99f35a4d4d9d"