From a3c288ec89ff46bd3d454422ff4d7e08667fdd21 Mon Sep 17 00:00:00 2001
From: Eric Larson <larson.eric.d@gmail.com>
Date: Tue, 27 Aug 2024 10:36:14 +1000
Subject: [PATCH] FIX: Push on main

---
 .github/workflows/ReleaseLatest.yml | 53 -----------------------------
 .github/workflows/main.yml          | 19 +++++++----
 2 files changed, 13 insertions(+), 59 deletions(-)
 delete mode 100644 .github/workflows/ReleaseLatest.yml

diff --git a/.github/workflows/ReleaseLatest.yml b/.github/workflows/ReleaseLatest.yml
deleted file mode 100644
index 9b9879e..0000000
--- a/.github/workflows/ReleaseLatest.yml
+++ /dev/null
@@ -1,53 +0,0 @@
-name: Release latest
-
-on:
-  push:
-    branches:
-      - 'main'
-  workflow_dispatch:
-
-jobs:
-  docker:
-    runs-on: ubuntu-latest
-    steps:
-
-      - uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v1
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build base image
-        run: docker compose build base
-
-      - name: List docker images
-        run: docker images
-
-      - name: Rename base image tag for release
-        run: docker tag mnetools/mne-python ghcr.io/mne-tools/mne-python
-
-      - name: Push base image to github
-        run: docker push ghcr.io/mne-tools/mne-python:latest
-
-      - name: Build jupyter image
-        run: docker compose build jupyter
-
-      - name: Rename jupyter image tag for release
-        run: docker tag mnetools/mne-python-jupyter ghcr.io/mne-tools/mne-python-jupyter
-
-      - name: Push jupyter image to github
-        run: docker push ghcr.io/mne-tools/mne-python-jupyter:latest
-
-      - name: Build plot image
-        run: docker compose build plot
-
-      - name: Rename plot image tag for release
-        run: docker tag mnetools/mne-python-plot ghcr.io/mne-tools/mne-python-plot
-
-      - name: Push plot image to github
-        run: docker push ghcr.io/mne-tools/mne-python-plot:latest
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5b75935..03daf47 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,14 +1,12 @@
 name: Tests
-
-# Controls when the action will run.
-on:
-  # Triggers the workflow on push or pull request events but only for the main branch
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.number }}-${{ github.event.ref }}
+  cancel-in-progress: true
+on:  # yamllint disable-line rule:truthy
   push:
     branches: [ main ]
   pull_request:
     branches: [ main ]
-
-  # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
 
 jobs:
@@ -23,17 +21,26 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - run: docker compose build base
+      - run: docker tag mnetools/mne-python ghcr.io/mne-tools/mne-python
       - name: System info - base image
         run: docker run mnetools/mne-python python -c "import mne; mne.sys_info()"
       - name: Run base test
         run: docker run -v `pwd`:/opt/app/examples mnetools/mne-python python /opt/app/examples/tests/base.py
       - run: docker compose build jupyter
+      - run: docker tag mnetools/mne-python-jupyter ghcr.io/mne-tools/mne-python-jupyter
       - name: System info - jupyter image
         run: docker run mnetools/mne-python-jupyter ipython -c "import mne; mne.sys_info()"
       - name: Run jupyter test
         run: docker run -v `pwd`:/opt/app/examples mnetools/mne-python-jupyter ipython /opt/app/examples/tests/base.py
       - run: docker compose build plot
+      - run: docker tag mnetools/mne-python-plot ghcr.io/mne-tools/mne-python-plot
       - name: System info - plot image
         run: docker run mnetools/mne-python-plot python -c "import mne; mne.sys_info()"
       - name: Run plotting test
         run: docker run -v `pwd`:/opt/app/examples mnetools/mne-python-plot python /opt/app/examples/tests/plot.py
+      - name: Push images to github
+        run: |
+          docker push ghcr.io/mne-tools/mne-python:latest
+          docker push ghcr.io/mne-tools/mne-python-jupyter:latest
+          docker push ghcr.io/mne-tools/mne-python-plot:latest
+        if: github.event_name == 'push' && github.repository == 'mne-tools/mne-docker'