From a02160f26f2a9c76f07a941b6197694fd8a18093 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Sun, 20 Jun 2021 19:45:23 +0300 Subject: [PATCH 1/3] Update miniforge --- base-notebook/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base-notebook/Dockerfile b/base-notebook/Dockerfile index 4b6d30f1..6dd06d92 100644 --- a/base-notebook/Dockerfile +++ b/base-notebook/Dockerfile @@ -26,7 +26,7 @@ USER root # Conda version ARG conda_version="4.10.1" # Miniforge installer patch version -ARG miniforge_patch_number="4" +ARG miniforge_patch_number="5" # Miniforge installer architecture ARG miniforge_arch="x86_64" # Package Manager and Python implementation to use (https://github.com/conda-forge/miniforge) @@ -39,7 +39,7 @@ ARG miniforge_version="${conda_version}-${miniforge_patch_number}" # Miniforge installer ARG miniforge_installer="${miniforge_python}-${miniforge_version}-Linux-${miniforge_arch}.sh" # Miniforge checksum -ARG miniforge_checksum="9eb335cb559644a6e462c077ebc129af51b7329817574fb707b994dafdddf2af" +ARG miniforge_checksum="069e151cae85ed4747721e938e7974aa00889a1ae87cff33ddbdde9530fc4c6d" # Install all OS dependencies for notebook server that starts but lacks all # features (e.g., download as all possible file formats) From c650161aa5125db551fe677fbea148aee597da8b Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Sun, 20 Jun 2021 19:52:10 +0300 Subject: [PATCH 2/3] Make github actions work for main branch --- .github/workflows/docker.yml | 6 +++--- .github/workflows/sphinx.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ebfb38dc..5fec352f 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -56,18 +56,18 @@ jobs: - name: Run Post-Build Hooks run: make -C main hook-all - name: Push Wiki to GitHub - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/master' || 'refs/heads/main' # Pass GITHUB_REPOSITORY directly to avoid conflict with GitHub Actions built-in env var run: make -C main git-commit GITHUB_REPOSITORY='${{github.repository}}.wiki' env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} LOCAL_PATH: ../wiki - name: Login to Docker Hub - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/master' || 'refs/heads/main' uses: docker/login-action@v1 with: username: ${{secrets.DOCKERHUB_USERNAME}} password: ${{secrets.DOCKERHUB_TOKEN}} - name: Push Images to DockerHub - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/master' || 'refs/heads/main' run: make -C main push-all diff --git a/.github/workflows/sphinx.yml b/.github/workflows/sphinx.yml index 033e974e..7a1899c9 100644 --- a/.github/workflows/sphinx.yml +++ b/.github/workflows/sphinx.yml @@ -35,13 +35,13 @@ jobs: - name: Build Documentation run: make docs - name: Extract Source Strings - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/master' || 'refs/heads/main' working-directory: docs run: | make gettext sphinx-intl update -p _build/gettext -l en - name: Push Strings to Master - if: github.ref == 'refs/heads/master' + if: github.ref == 'refs/heads/master' || 'refs/heads/main' run: make git-commit env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} From 122fdd8a99dd4d12627741e39bcf5316980bd878 Mon Sep 17 00:00:00 2001 From: Ayaz Salikhov Date: Sun, 20 Jun 2021 19:54:10 +0300 Subject: [PATCH 3/3] Fix --- .github/workflows/docker.yml | 6 +++--- .github/workflows/sphinx.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 5fec352f..714e705d 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -56,18 +56,18 @@ jobs: - name: Run Post-Build Hooks run: make -C main hook-all - name: Push Wiki to GitHub - if: github.ref == 'refs/heads/master' || 'refs/heads/main' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' # Pass GITHUB_REPOSITORY directly to avoid conflict with GitHub Actions built-in env var run: make -C main git-commit GITHUB_REPOSITORY='${{github.repository}}.wiki' env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} LOCAL_PATH: ../wiki - name: Login to Docker Hub - if: github.ref == 'refs/heads/master' || 'refs/heads/main' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' uses: docker/login-action@v1 with: username: ${{secrets.DOCKERHUB_USERNAME}} password: ${{secrets.DOCKERHUB_TOKEN}} - name: Push Images to DockerHub - if: github.ref == 'refs/heads/master' || 'refs/heads/main' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' run: make -C main push-all diff --git a/.github/workflows/sphinx.yml b/.github/workflows/sphinx.yml index 7a1899c9..f28f7ee3 100644 --- a/.github/workflows/sphinx.yml +++ b/.github/workflows/sphinx.yml @@ -35,13 +35,13 @@ jobs: - name: Build Documentation run: make docs - name: Extract Source Strings - if: github.ref == 'refs/heads/master' || 'refs/heads/main' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' working-directory: docs run: | make gettext sphinx-intl update -p _build/gettext -l en - name: Push Strings to Master - if: github.ref == 'refs/heads/master' || 'refs/heads/main' + if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main' run: make git-commit env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}