From 366f3787e3f82d85c9dc9efa7197940895e17120 Mon Sep 17 00:00:00 2001 From: Firas Moosvi Date: Tue, 7 Sep 2021 01:20:21 -0700 Subject: [PATCH 1/8] Add IRKernel --- .github/workflows/main.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 970a1ec..15028b0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -14,10 +14,16 @@ jobs: - uses: actions/checkout@v2 # Install dependencies - - name: Set up Python 3.7 + - name: Set up Python 3.9 uses: actions/setup-python@v1 with: - python-version: 3.7 + python-version: 3.9 + + - uses: actions/checkout@master + - uses: r-lib/actions/setup-r@v1 + with: + r-version: '4.1' # The R version to download (if necessary) and use. + - run: Rscript -e 'install.packages('IRkernel');IRkernel::installspec()' - name: Install dependencies run: | From e0f4750699700fdb81c9a0c43920b7fc37cb11cf Mon Sep 17 00:00:00 2001 From: Firas Moosvi Date: Tue, 7 Sep 2021 01:24:10 -0700 Subject: [PATCH 2/8] add caching and update install packages --- .github/workflows/main.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 15028b0..9b7a721 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,11 +19,17 @@ jobs: with: python-version: 3.9 + - name: cache installation + uses: actions/cache@v2 + with: + path: ${{ env.pythonLocation }} + key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('requirements.txt') }} + - uses: actions/checkout@master - uses: r-lib/actions/setup-r@v1 with: r-version: '4.1' # The R version to download (if necessary) and use. - - run: Rscript -e 'install.packages('IRkernel');IRkernel::installspec()' + - run: Rscript -e "install.packages('IRkernel');IRkernel::installspec()" - name: Install dependencies run: | From 6215c3a9cc19f395e71508d551b1aaee17e9121e Mon Sep 17 00:00:00 2001 From: Firas Moosvi Date: Tue, 7 Sep 2021 01:32:22 -0700 Subject: [PATCH 3/8] Try splitting the two commands? --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9b7a721..592d82f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,8 +29,9 @@ jobs: - uses: r-lib/actions/setup-r@v1 with: r-version: '4.1' # The R version to download (if necessary) and use. - - run: Rscript -e "install.packages('IRkernel');IRkernel::installspec()" - + - run: Rscript -e "install.packages('IRkernel')" + - run: Rscript -e "IRkernel::installspec()" + - name: Install dependencies run: | pip install -r requirements.txt From bfb9426a073f908d21caa30e12f85b844b5cf93d Mon Sep 17 00:00:00 2001 From: Firas Moosvi Date: Tue, 7 Sep 2021 01:34:52 -0700 Subject: [PATCH 4/8] Add jupyter --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index 7e821e4..8b5d5fc 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,4 @@ +jupyter jupyter-book matplotlib numpy From bc56b20484be26a48f6955f9567bbea946b4f98c Mon Sep 17 00:00:00 2001 From: Firas Moosvi Date: Tue, 7 Sep 2021 01:35:57 -0700 Subject: [PATCH 5/8] Move R after python deps --- .github/workflows/main.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 592d82f..d392d90 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -24,6 +24,10 @@ jobs: with: path: ${{ env.pythonLocation }} key: ${{ env.pythonLocation }}-${{ hashFiles('setup.py') }}-${{ hashFiles('requirements.txt') }} + + - name: Install dependencies + run: | + pip install -r requirements.txt - uses: actions/checkout@master - uses: r-lib/actions/setup-r@v1 @@ -32,9 +36,6 @@ jobs: - run: Rscript -e "install.packages('IRkernel')" - run: Rscript -e "IRkernel::installspec()" - - name: Install dependencies - run: | - pip install -r requirements.txt # Build the book - name: Build the book run: | From 6184d1826dc87ff90f334d920fbf158aead76860 Mon Sep 17 00:00:00 2001 From: Firas Moosvi Date: Tue, 7 Sep 2021 01:48:23 -0700 Subject: [PATCH 6/8] Update main.yml --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d392d90..d89ed4c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,7 +47,7 @@ jobs: REMOTE_HOST: ${{ secrets.REMOTE_HOST }} REMOTE_USER: ${{ secrets.REMOTE_USER }} REMOTE_KEY: ${{ secrets.SERVER_SSH_KEY }} - REMOTE_DIR: ${{ secrets.REMOTE_TARGET }} + REMOTE_DIR: ${{ secrets.REMOTE_TARGET_UBCO }} LOCAL_DIR: "_build/html/" COURSE_NAME: "data531" TERM: "2021_WT1" From 2215e0e001c412c6d5182dfdc1d35af4ad4b09cc Mon Sep 17 00:00:00 2001 From: Firas Moosvi Date: Tue, 7 Sep 2021 01:59:19 -0700 Subject: [PATCH 7/8] fix secrets --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d89ed4c..4f0f05c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,8 +44,8 @@ jobs: # Push to server - name: rsync and ssh env: - REMOTE_HOST: ${{ secrets.REMOTE_HOST }} - REMOTE_USER: ${{ secrets.REMOTE_USER }} + REMOTE_HOST: ${{ secrets.REMOTE_HOST_UBCO }} + REMOTE_USER: ${{ secrets.REMOTE_USER_UBCO }} REMOTE_KEY: ${{ secrets.SERVER_SSH_KEY }} REMOTE_DIR: ${{ secrets.REMOTE_TARGET_UBCO }} LOCAL_DIR: "_build/html/" From 7c1dbf6e5720fe449f7d568817cab915ab740d8f Mon Sep 17 00:00:00 2001 From: Firas Moosvi Date: Tue, 7 Sep 2021 03:31:16 -0700 Subject: [PATCH 8/8] fix commits --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4f0f05c..d392d90 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -44,10 +44,10 @@ jobs: # Push to server - name: rsync and ssh env: - REMOTE_HOST: ${{ secrets.REMOTE_HOST_UBCO }} - REMOTE_USER: ${{ secrets.REMOTE_USER_UBCO }} + REMOTE_HOST: ${{ secrets.REMOTE_HOST }} + REMOTE_USER: ${{ secrets.REMOTE_USER }} REMOTE_KEY: ${{ secrets.SERVER_SSH_KEY }} - REMOTE_DIR: ${{ secrets.REMOTE_TARGET_UBCO }} + REMOTE_DIR: ${{ secrets.REMOTE_TARGET }} LOCAL_DIR: "_build/html/" COURSE_NAME: "data531" TERM: "2021_WT1"