From 847287db24286adc7db8d79b0295b279ef4fdd3a Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Thu, 12 Nov 2020 14:45:24 -0500 Subject: [PATCH 1/5] add a dummy change to test CI --- nsls2ptycho/ptycho_gui.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nsls2ptycho/ptycho_gui.py b/nsls2ptycho/ptycho_gui.py index 0e8e3f5..08df4d5 100644 --- a/nsls2ptycho/ptycho_gui.py +++ b/nsls2ptycho/ptycho_gui.py @@ -21,6 +21,7 @@ from nsls2ptycho.roi_gui import RoiWindow from nsls2ptycho.scan_pt import ScanWindow + import h5py import numpy as np from numpy import pi From dfd80cf13cb11c49840d659d9800d181433ea5d4 Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Thu, 12 Nov 2020 14:52:12 -0500 Subject: [PATCH 2/5] try GITHUB_TOKEN --- .github/workflows/linux_gpu.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/linux_gpu.yml b/.github/workflows/linux_gpu.yml index 50c351c..11f28d3 100644 --- a/.github/workflows/linux_gpu.yml +++ b/.github/workflows/linux_gpu.yml @@ -23,8 +23,7 @@ jobs: with: submodules: true - # a personal access token is added as a secret to this repo - token: ${{ secrets.GH_ACTIONS_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} # Runs a single command using the runners shell - name: Ensure the right machine From 0fe7b248e07dfd98ec214a49074e87d70a4ca569 Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Thu, 12 Nov 2020 14:57:48 -0500 Subject: [PATCH 3/5] try updating git --- .github/workflows/linux_gpu.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux_gpu.yml b/.github/workflows/linux_gpu.yml index 11f28d3..16eb8e3 100644 --- a/.github/workflows/linux_gpu.yml +++ b/.github/workflows/linux_gpu.yml @@ -17,13 +17,24 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: + # Create a Conda env and install a newer git there for git clone + - name: Create Conda environment + run: | + conda create -n _github_runner -c conda-forge -y python=3.7 \ + pyfftw pyqt=5 numpy scipy matplotlib pillow h5py posix_ipc databroker openmpi mpi4py numba + source $HOME/miniconda3/bin/activate _github_runner + conda install -c conda-forge -y git + which git + git --version + + # Check out the repo recursively - name: Chekout # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it uses: actions/checkout@v2 with: submodules: true - token: ${{ secrets.GITHUB_TOKEN }} + token: ${{ secrets.GITHUB_TOKEN }} # only GITHUB_TOKEN can be used by forked repos # Runs a single command using the runners shell - name: Ensure the right machine @@ -32,9 +43,6 @@ jobs: # Runs a set of commands using the runners shell - name: Test Conda environment run: | - conda create -n _github_runner -c conda-forge -y python=3.7 \ - pyfftw pyqt=5 numpy scipy matplotlib pillow h5py posix_ipc databroker openmpi mpi4py numba - source $HOME/miniconda3/bin/activate _github_runner conda list python --version pip install -v . From 41bc3b2974a3aaeeb5778b492ff8d1aaded61d35 Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Thu, 12 Nov 2020 15:36:24 -0500 Subject: [PATCH 4/5] use old token --- .github/workflows/linux_gpu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/linux_gpu.yml b/.github/workflows/linux_gpu.yml index 16eb8e3..fc4ec40 100644 --- a/.github/workflows/linux_gpu.yml +++ b/.github/workflows/linux_gpu.yml @@ -34,7 +34,7 @@ jobs: with: submodules: true - token: ${{ secrets.GITHUB_TOKEN }} # only GITHUB_TOKEN can be used by forked repos + token: ${{ secrets.GH_ACTIONS_TOKEN }} # only GITHUB_TOKEN can be used by forked repos # Runs a single command using the runners shell - name: Ensure the right machine From 961c767cba6bcbe5206517a8deb5e2a756d320ca Mon Sep 17 00:00:00 2001 From: Leo Fang Date: Thu, 12 Nov 2020 15:50:19 -0500 Subject: [PATCH 5/5] seperate checkout steps --- .github/workflows/linux_gpu.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux_gpu.yml b/.github/workflows/linux_gpu.yml index fc4ec40..5f23824 100644 --- a/.github/workflows/linux_gpu.yml +++ b/.github/workflows/linux_gpu.yml @@ -27,13 +27,15 @@ jobs: which git git --version - # Check out the repo recursively + # Check out the main - name: Chekout # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it uses: actions/checkout@v2 - + + - name: Init submodule + run: | + git submodule update --init with: - submodules: true token: ${{ secrets.GH_ACTIONS_TOKEN }} # only GITHUB_TOKEN can be used by forked repos # Runs a single command using the runners shell