From 710073100810413b88aa7e417a6c99b911db03ea Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Mon, 28 Nov 2022 12:53:35 -0500 Subject: [PATCH 01/36] ci(travis): comment out broken surge code --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4faa49fcd..8623c06f5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,14 +21,14 @@ before_script: - export DOMAIN=random-cat-${TRAVIS_PULL_REQUEST}.surge.sh - export SURGE_LOGIN="daniel.wheeler@nist.gov" - export SURGE_TOKEN="fcab9043c16e76c558d16bf6dc380f79" - - if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then - nix-shell --command " - rm -rf ./_site && - jekyll build --baseurl '' && - surge --project _site --domain ${DOMAIN} && - ./_apps/data/curl.sh - "; - fi; + - #if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then + # nix-shell --command " + # rm -rf ./_site && + # jekyll build --baseurl '' && + # surge --project _site --domain ${DOMAIN} && + # ./_apps/data/curl.sh + # "; + #fi; - nix-shell _apps/data/shell.nix --pure --command "echo 'run nix-shell and exit'" script: - nix-shell --command " From 6fff91ca4b2e51eff2e5a4abc4320a2ee523ecf8 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Mon, 28 Nov 2022 12:54:02 -0500 Subject: [PATCH 02/36] build(nix): add new surge nix build Add an updated build for Surge and Jekyll. This will be the basis for the new shell.nix eventually. --- shell-surge.nix | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 shell-surge.nix diff --git a/shell-surge.nix b/shell-surge.nix new file mode 100644 index 000000000..e9d685f37 --- /dev/null +++ b/shell-surge.nix @@ -0,0 +1,26 @@ +{ + tag ? "22.05" +}: +let + pkgs = import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/${tag}.tar.gz") {}; + pypkgs = pkgs.python3Packages; +in + pkgs.mkShell rec { + pname = "pfhub-surge"; + nativeBuildInputs = with pypkgs; [ + pkgs.rubyPackages.github-pages + pkgs.nodePackages.surge + pypkgs.python + ]; + shellHook = '' + # export NIX_SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt + # export OMPI_MCA_plm_rsh_agent=${pkgs.openssh}/bin/ssh + + SOURCE_DATE_EPOCH=$(date +%s) + export PYTHONUSERBASE=$PWD/.local + export USER_SITE=`python -c "import site; print(site.USER_SITE)"` + export PYTHONPATH=$PYTHONPATH:$USER_SITE + export PATH=$PATH:$PYTHONUSERBASE/bin + + ''; + } From 6a025ee53ab4c11bcf794e82fd3f43a067ae09fd Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Mon, 28 Nov 2022 12:55:00 -0500 Subject: [PATCH 03/36] ci(actions): new surge implementation New Surge implementation on GitHub Actions. Removing Surge push from Travis CI and using GitHub Actions instead with an updated Nix build. --- .github/workflows/surge.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/surge.yml diff --git a/.github/workflows/surge.yml b/.github/workflows/surge.yml new file mode 100644 index 000000000..4454a6b34 --- /dev/null +++ b/.github/workflows/surge.yml @@ -0,0 +1,26 @@ +--- +name: Surge +on: [push, pull_request] +jobs: + surge: + runs-on: ubuntu-latest + defaults: + run: + working-directory: ./ + steps: + - uses: actions/checkout@v2.3.4 + - uses: cachix/install-nix-action@v14.1 + with: + nix_path: nixpkgs=channel:nixos-unstable + name: pfhub + authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' + extraPullNames: nix-community + - run: | + nix-shell shell-surge.sh pure --command " \ + export DOMAIN=random-cat-${{ github.event.number }}.surge.sh && \ + export SURGE_LOGIN=${{ secrets.SURGE_LOGIN }} && \ + export SURGE_TOKEN=${{ secrets.SURGE_TOKEN }} $$ \ + rm -rf ./_site && \ + jekyll build && \ + surge --project _site --domain ${DOMAIN}/pfhub \ + " From 01bc1c58309c66ef3a8f55b6f8d1da273696d004 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Mon, 28 Nov 2022 13:08:10 -0500 Subject: [PATCH 04/36] fix bug --- .github/workflows/surge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/surge.yml b/.github/workflows/surge.yml index 4454a6b34..087c6ce22 100644 --- a/.github/workflows/surge.yml +++ b/.github/workflows/surge.yml @@ -16,7 +16,7 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' extraPullNames: nix-community - run: | - nix-shell shell-surge.sh pure --command " \ + nix-shell shell-surge.nix pure --command " \ export DOMAIN=random-cat-${{ github.event.number }}.surge.sh && \ export SURGE_LOGIN=${{ secrets.SURGE_LOGIN }} && \ export SURGE_TOKEN=${{ secrets.SURGE_TOKEN }} $$ \ From ea053d8351bc01a6224038fa281e86eb999ad9e0 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Mon, 28 Nov 2022 13:31:05 -0500 Subject: [PATCH 05/36] fix bug --- .github/workflows/surge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/surge.yml b/.github/workflows/surge.yml index 087c6ce22..bf21a11c0 100644 --- a/.github/workflows/surge.yml +++ b/.github/workflows/surge.yml @@ -16,7 +16,7 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' extraPullNames: nix-community - run: | - nix-shell shell-surge.nix pure --command " \ + nix-shell shell-surge.nix --pure --command " \ export DOMAIN=random-cat-${{ github.event.number }}.surge.sh && \ export SURGE_LOGIN=${{ secrets.SURGE_LOGIN }} && \ export SURGE_TOKEN=${{ secrets.SURGE_TOKEN }} $$ \ From 19a217cadb7e022906ba4eec0697408f79afafc8 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Mon, 28 Nov 2022 13:39:48 -0500 Subject: [PATCH 06/36] fix bug --- .github/workflows/surge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/surge.yml b/.github/workflows/surge.yml index bf21a11c0..dcbe99ac4 100644 --- a/.github/workflows/surge.yml +++ b/.github/workflows/surge.yml @@ -19,7 +19,7 @@ jobs: nix-shell shell-surge.nix --pure --command " \ export DOMAIN=random-cat-${{ github.event.number }}.surge.sh && \ export SURGE_LOGIN=${{ secrets.SURGE_LOGIN }} && \ - export SURGE_TOKEN=${{ secrets.SURGE_TOKEN }} $$ \ + export SURGE_TOKEN=${{ secrets.SURGE_TOKEN }} && \ rm -rf ./_site && \ jekyll build && \ surge --project _site --domain ${DOMAIN}/pfhub \ From a5e43b875bfd35daf31d3e7902a3e3b21d96f60e Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Mon, 28 Nov 2022 13:49:10 -0500 Subject: [PATCH 07/36] debug --- .github/workflows/surge.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/surge.yml b/.github/workflows/surge.yml index dcbe99ac4..2c09a8bc6 100644 --- a/.github/workflows/surge.yml +++ b/.github/workflows/surge.yml @@ -20,7 +20,8 @@ jobs: export DOMAIN=random-cat-${{ github.event.number }}.surge.sh && \ export SURGE_LOGIN=${{ secrets.SURGE_LOGIN }} && \ export SURGE_TOKEN=${{ secrets.SURGE_TOKEN }} && \ - rm -rf ./_site && \ - jekyll build && \ - surge --project _site --domain ${DOMAIN}/pfhub \ + echo ${SURGE_LOGIN} && \ + #rm -rf ./_site && \ + #jekyll build && \ + #surge --project _site --domain ${DOMAIN}/pfhub \ " From 09dc777966a254ce3ccca9a57b3ea263fd725476 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Mon, 28 Nov 2022 13:52:32 -0500 Subject: [PATCH 08/36] debug --- .github/workflows/surge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/surge.yml b/.github/workflows/surge.yml index 2c09a8bc6..f966245dd 100644 --- a/.github/workflows/surge.yml +++ b/.github/workflows/surge.yml @@ -20,6 +20,7 @@ jobs: export DOMAIN=random-cat-${{ github.event.number }}.surge.sh && \ export SURGE_LOGIN=${{ secrets.SURGE_LOGIN }} && \ export SURGE_TOKEN=${{ secrets.SURGE_TOKEN }} && \ + echo 'SURGE_LOGIN:' && \ echo ${SURGE_LOGIN} && \ #rm -rf ./_site && \ #jekyll build && \ From a4857e3f50895b898a67223f2fd786f1cd4e6fd9 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Mon, 28 Nov 2022 14:05:59 -0500 Subject: [PATCH 09/36] debug --- .github/workflows/surge.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.github/workflows/surge.yml b/.github/workflows/surge.yml index f966245dd..d03e51a37 100644 --- a/.github/workflows/surge.yml +++ b/.github/workflows/surge.yml @@ -1,6 +1,10 @@ --- name: Surge on: [push, pull_request] +env: + SURGE_LOGIN: ${{ secrets.SURGE_LOGIN }} + SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }} + DOMAIN: random-cat-${{ github.event.number }}.surge.sh jobs: surge: runs-on: ubuntu-latest @@ -16,12 +20,12 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' extraPullNames: nix-community - run: | - nix-shell shell-surge.nix --pure --command " \ - export DOMAIN=random-cat-${{ github.event.number }}.surge.sh && \ - export SURGE_LOGIN=${{ secrets.SURGE_LOGIN }} && \ - export SURGE_TOKEN=${{ secrets.SURGE_TOKEN }} && \ + nix-shell shell-surge.nix --command " \ echo 'SURGE_LOGIN:' && \ echo ${SURGE_LOGIN} && \ + echo 'DOMAIN:' && \ + echo ${DOMAIN} && \ + #rm -rf ./_site && \ #jekyll build && \ #surge --project _site --domain ${DOMAIN}/pfhub \ From c312693db361d3859a828e9f9068b26de4ef044c Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Mon, 28 Nov 2022 14:20:53 -0500 Subject: [PATCH 10/36] debug --- .github/workflows/surge.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/surge.yml b/.github/workflows/surge.yml index d03e51a37..9b488b288 100644 --- a/.github/workflows/surge.yml +++ b/.github/workflows/surge.yml @@ -1,10 +1,6 @@ --- name: Surge on: [push, pull_request] -env: - SURGE_LOGIN: ${{ secrets.SURGE_LOGIN }} - SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }} - DOMAIN: random-cat-${{ github.event.number }}.surge.sh jobs: surge: runs-on: ubuntu-latest @@ -19,13 +15,16 @@ jobs: name: pfhub authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' extraPullNames: nix-community - - run: | + - env: + SURGE_LOGIN: ${{ secrets.SURGE_LOGIN }} + SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }} + DOMAIN: random-cat-${{ github.event.number }}.surge.sh + run: | nix-shell shell-surge.nix --command " \ echo 'SURGE_LOGIN:' && \ echo ${SURGE_LOGIN} && \ echo 'DOMAIN:' && \ echo ${DOMAIN} && \ - #rm -rf ./_site && \ #jekyll build && \ #surge --project _site --domain ${DOMAIN}/pfhub \ From 4cf881fdc83cddb9b9dcbb2638db1d381f9204a5 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Mon, 28 Nov 2022 14:48:34 -0500 Subject: [PATCH 11/36] debug --- .github/workflows/surge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/surge.yml b/.github/workflows/surge.yml index 9b488b288..e53b8043a 100644 --- a/.github/workflows/surge.yml +++ b/.github/workflows/surge.yml @@ -16,8 +16,8 @@ jobs: authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' extraPullNames: nix-community - env: - SURGE_LOGIN: ${{ secrets.SURGE_LOGIN }} - SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }} + SURGE_LOGIN: "${{ secrets.SURGE_LOGIN }}" + SURGE_TOKEN: "${{ secrets.SURGE_TOKEN }}" DOMAIN: random-cat-${{ github.event.number }}.surge.sh run: | nix-shell shell-surge.nix --command " \ From e7ad621ab9dfb35e57de09875718a67b473abed5 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Tue, 29 Nov 2022 15:06:16 -0500 Subject: [PATCH 12/36] ci(actions): surge workflow does nothing now Surge workflow launches and does nothing. It is just used to prompt a workflow on master that has access to the secrets. --- .github/workflows/surge.yml | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/.github/workflows/surge.yml b/.github/workflows/surge.yml index e53b8043a..bcddd0405 100644 --- a/.github/workflows/surge.yml +++ b/.github/workflows/surge.yml @@ -1,31 +1,10 @@ --- -name: Surge -on: [push, pull_request] +# Luanch a workflow called surge to run surge-push on master. Required +# as jobs launched via pull-requests do not have access to secrets. +name: surge +on: [push, pull-request] jobs: surge: runs-on: ubuntu-latest - defaults: - run: - working-directory: ./ steps: - - uses: actions/checkout@v2.3.4 - - uses: cachix/install-nix-action@v14.1 - with: - nix_path: nixpkgs=channel:nixos-unstable - name: pfhub - authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}' - extraPullNames: nix-community - - env: - SURGE_LOGIN: "${{ secrets.SURGE_LOGIN }}" - SURGE_TOKEN: "${{ secrets.SURGE_TOKEN }}" - DOMAIN: random-cat-${{ github.event.number }}.surge.sh - run: | - nix-shell shell-surge.nix --command " \ - echo 'SURGE_LOGIN:' && \ - echo ${SURGE_LOGIN} && \ - echo 'DOMAIN:' && \ - echo ${DOMAIN} && \ - #rm -rf ./_site && \ - #jekyll build && \ - #surge --project _site --domain ${DOMAIN}/pfhub \ - " + - run: echo "prompt to launch surge" From 32a050f596b07cd6467317746931e08c2bd347f9 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 13:11:59 -0500 Subject: [PATCH 13/36] ci(actions): use more sensible name for workflow Use a more sensible name for the workflow that signals to other workflows that there is a new pull request. --- .github/workflows/pullrequest.yml | 10 ++++++++++ .github/workflows/surge.yml | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/pullrequest.yml delete mode 100644 .github/workflows/surge.yml diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml new file mode 100644 index 000000000..4fda619cd --- /dev/null +++ b/.github/workflows/pullrequest.yml @@ -0,0 +1,10 @@ +--- +# Launch a workflow to prompt workflows run from master. Required +# as jobs launched via pull-requests do not have access to secrets. +name: pullrequest +on: [push, pull-request] +jobs: + pullrequest: + runs-on: ubuntu-latest + steps: + - run: echo "prompt to launch other jobs in event of pull request" diff --git a/.github/workflows/surge.yml b/.github/workflows/surge.yml deleted file mode 100644 index bcddd0405..000000000 --- a/.github/workflows/surge.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# Luanch a workflow called surge to run surge-push on master. Required -# as jobs launched via pull-requests do not have access to secrets. -name: surge -on: [push, pull-request] -jobs: - surge: - runs-on: ubuntu-latest - steps: - - run: echo "prompt to launch surge" From d44a662c4f5aa74180cd8c4bd53e6f5bac5c84c9 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 13:15:59 -0500 Subject: [PATCH 14/36] ci(actions): pull-request -> pull_request Event name was incorrect. --- .github/workflows/pullrequest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 4fda619cd..f84c63146 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -2,7 +2,7 @@ # Launch a workflow to prompt workflows run from master. Required # as jobs launched via pull-requests do not have access to secrets. name: pullrequest -on: [push, pull-request] +on: [push, pull_request] jobs: pullrequest: runs-on: ubuntu-latest From a643284c7eb4c9fd5900c770fe205ae879026d28 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 13:34:18 -0500 Subject: [PATCH 15/36] trigger github actions From 2a34fee8e7b1a5c5b7feef27dabc2ce4eeb9491b Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 13:51:27 -0500 Subject: [PATCH 16/36] ci(actions): save pull request number Save pull request number as an artifact for other workflows. --- .github/workflows/pullrequest.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index f84c63146..78be12e9b 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -7,4 +7,13 @@ jobs: pullrequest: runs-on: ubuntu-latest steps: - - run: echo "prompt to launch other jobs in event of pull request" + - name: save + env: + PR_NUMBER: ${{ github.event.number }} + run: | + mkdir -p ./pr + echo $PR_NUMBER > ./pr/pr_number + - uses: actions/upload-artifact@v3 + with: + name: pr_number + path: pr/ From fa50d52579b62088cd41c88e1c37134a4948827a Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 14:23:24 -0500 Subject: [PATCH 17/36] trigger github actions From 3429af11efc323eef3a66490bf920d050c5081cb Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 14:29:29 -0500 Subject: [PATCH 18/36] trigger github actions From 81822e479ee9060a34b3069eab88d0e9cdb1ed09 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 14:37:51 -0500 Subject: [PATCH 19/36] trigger github actions From 19ed65c461a6e85f828ea9f2f978394d5e9e05a2 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 14:52:02 -0500 Subject: [PATCH 20/36] trigger github actions From 4cf896f2d159be63b2bc43b24a3819233a2850bc Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 14:55:21 -0500 Subject: [PATCH 21/36] trigger github actions From a52bbc80686ba7e79d9e146cf1d3fadf802b4ca0 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 15:04:53 -0500 Subject: [PATCH 22/36] trigger github actions From f676d0f71ee3a93c033c6282b20365283b7a76eb Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 15:13:54 -0500 Subject: [PATCH 23/36] trigger github actions From 2a1fc6758375e64c7dac8b3e941cf406ea03ab68 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 15:40:44 -0500 Subject: [PATCH 24/36] trigger actions From 782207f625b4709f571e85e0d9c6cb0968271726 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 15:47:38 -0500 Subject: [PATCH 25/36] trigger actions From bd3a00bc61ef1cfbb2bd9c5a55c2da768b764d5d Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 16:09:38 -0500 Subject: [PATCH 26/36] trigger actions From b059d8dc8b3523ad19c5fe765b62aec338033ee8 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 17:02:28 -0500 Subject: [PATCH 27/36] ci(actions): include login in artifacts --- .github/workflows/pullrequest.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 78be12e9b..da915c8cf 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -7,12 +7,14 @@ jobs: pullrequest: runs-on: ubuntu-latest steps: - - name: save + - name: save-pr env: PR_NUMBER: ${{ github.event.number }} + LOGIN: ${{ github.event.actor.login }} run: | mkdir -p ./pr echo $PR_NUMBER > ./pr/pr_number + echo $LOGIN > ./pr/login - uses: actions/upload-artifact@v3 with: name: pr_number From 0dddd5c8eafb868a15faf7862c6209c997d2cf82 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 17:32:53 -0500 Subject: [PATCH 28/36] ci(actions): debug --- .github/workflows/pullrequest.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index da915c8cf..2287736af 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -7,6 +7,7 @@ jobs: pullrequest: runs-on: ubuntu-latest steps: + - echo "${{ github.event.actor.login }}" - name: save-pr env: PR_NUMBER: ${{ github.event.number }} From 2f57ae56c313a25f7a338abddf07f63b7d28dd8c Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 17:34:02 -0500 Subject: [PATCH 29/36] ci(actions): debug --- .github/workflows/pullrequest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 2287736af..1d9e39d6f 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -7,7 +7,7 @@ jobs: pullrequest: runs-on: ubuntu-latest steps: - - echo "${{ github.event.actor.login }}" + - run: echo "${{ github.event.actor.login }}" - name: save-pr env: PR_NUMBER: ${{ github.event.number }} From 10e28e4ccdbf604bb3308bd4df69928e075a1d4b Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 17:47:27 -0500 Subject: [PATCH 30/36] ci(actions): debug --- .github/workflows/pullrequest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 1d9e39d6f..7fdbb8d33 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -7,11 +7,11 @@ jobs: pullrequest: runs-on: ubuntu-latest steps: - - run: echo "${{ github.event.actor.login }}" + - run: echo "${{ github.event.pull_request.user.login }}" - name: save-pr env: PR_NUMBER: ${{ github.event.number }} - LOGIN: ${{ github.event.actor.login }} + LOGIN: ${{ github.event.issue.user.login }} run: | mkdir -p ./pr echo $PR_NUMBER > ./pr/pr_number From 714ebfb428a38c1e8a7dde847bbac5e5a5a0755c Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Wed, 30 Nov 2022 17:48:54 -0500 Subject: [PATCH 31/36] ci(actions): debug --- .github/workflows/pullrequest.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index 7fdbb8d33..a6377cba1 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -7,11 +7,10 @@ jobs: pullrequest: runs-on: ubuntu-latest steps: - - run: echo "${{ github.event.pull_request.user.login }}" - name: save-pr env: PR_NUMBER: ${{ github.event.number }} - LOGIN: ${{ github.event.issue.user.login }} + LOGIN: ${{ github.event.pull_request.user.login }} run: | mkdir -p ./pr echo $PR_NUMBER > ./pr/pr_number From b103dd67448db95ea364e1d179a19d64b75a9405 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Thu, 1 Dec 2022 14:26:33 -0500 Subject: [PATCH 32/36] docs: document pushing shell-surge.nix to cachix --- NIX.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/NIX.md b/NIX.md index e8d7d4759..5a3c8f175 100644 --- a/NIX.md +++ b/NIX.md @@ -67,4 +67,10 @@ Then run $ node2nix --input node-packages.json --output node-packages.nix --composition node.nix Edit `node.nix` and replace `nodejs-4_x` with `nodejs` in the 5th -line. \ No newline at end of file +line. + +### Upload Surge to Cachix + + $ nix-env -iA cachix -f https://cachix.org/api/v1/install + $ cachix authtoken + $ nix_build -E '(import ./shell-surge.nix {}).nativeBuildInputs' | cachix push pfhub-surge From ad4f9ca984f5b54c3637b0a68b7ecd09fda351a6 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Thu, 1 Dec 2022 14:50:36 -0500 Subject: [PATCH 33/36] trigger actions From ebab313704970fb11ced9f6894c0b6eb8dbf794f Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Thu, 1 Dec 2022 14:52:10 -0500 Subject: [PATCH 34/36] trigger actions From a299e9319d270f0d34d58ce6fcdbedd9b29fee4e Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Thu, 1 Dec 2022 14:58:17 -0500 Subject: [PATCH 35/36] trigger actions From 38cdc539ca2eecc671bd9e44f719b188af782c03 Mon Sep 17 00:00:00 2001 From: Daniel Wheeler Date: Fri, 2 Dec 2022 12:29:24 -0500 Subject: [PATCH 36/36] ci(travis): remove surge push Surge push is now executed by GitHub actions. --- .travis.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8623c06f5..2a4109e13 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,17 +18,6 @@ before_cache: install: - nix-shell --pure --command "echo 'run nix-shell and exit'" before_script: - - export DOMAIN=random-cat-${TRAVIS_PULL_REQUEST}.surge.sh - - export SURGE_LOGIN="daniel.wheeler@nist.gov" - - export SURGE_TOKEN="fcab9043c16e76c558d16bf6dc380f79" - - #if [[ "$TRAVIS_PULL_REQUEST" != "false" ]]; then - # nix-shell --command " - # rm -rf ./_site && - # jekyll build --baseurl '' && - # surge --project _site --domain ${DOMAIN} && - # ./_apps/data/curl.sh - # "; - #fi; - nix-shell _apps/data/shell.nix --pure --command "echo 'run nix-shell and exit'" script: - nix-shell --command "