From bd2169620341e87252daea4426c3829fb1240bef Mon Sep 17 00:00:00 2001 From: Taylor Steinberg Date: Fri, 27 Oct 2023 14:48:36 -0400 Subject: [PATCH] Reverts change to use 'just ci' command. (#322) --- .github/workflows/agent.yaml | 3 +- .github/workflows/bats.yaml | 6 ++-- .github/workflows/cypress.yaml | 3 +- .github/workflows/jupyterlab.yaml | 4 ++- .github/workflows/positron.yaml | 8 +++-- .github/workflows/web.yaml | 4 ++- .../jupyterlab/connect_jupyterlab/justfile | 10 ------- extensions/positron/justfile | 13 ++------ justfile | 30 +++++++------------ test/bats/justfile | 11 +------ test/cy/justfile | 13 +------- web/justfile | 18 +++-------- 12 files changed, 38 insertions(+), 85 deletions(-) diff --git a/.github/workflows/agent.yaml b/.github/workflows/agent.yaml index 140da7f93..73244c0ce 100644 --- a/.github/workflows/agent.yaml +++ b/.github/workflows/agent.yaml @@ -9,4 +9,5 @@ jobs: with: fetch-depth: 0 - uses: ./.github/actions/setup - - run: just ci + - run: just lint + - run: just test diff --git a/.github/workflows/bats.yaml b/.github/workflows/bats.yaml index 97c3c660c..121b8ab77 100644 --- a/.github/workflows/bats.yaml +++ b/.github/workflows/bats.yaml @@ -20,7 +20,8 @@ jobs: name: executables path: bin - run: chmod -R +x ./bin - - run: just bats ci + - run: just bats install + - run: just bats test docker: strategy: fail-fast: false @@ -37,4 +38,5 @@ jobs: name: executables path: bin - run: chmod -R +x ./bin - - run: just bats ci + - run: just bats install + - run: just bats test diff --git a/.github/workflows/cypress.yaml b/.github/workflows/cypress.yaml index 9d3f04aa7..6c3fb45d5 100644 --- a/.github/workflows/cypress.yaml +++ b/.github/workflows/cypress.yaml @@ -20,4 +20,5 @@ jobs: name: executables path: bin - run: chmod -R +x ./bin - - run: just cy ci + - run: just cy install + - run: just cy test diff --git a/.github/workflows/jupyterlab.yaml b/.github/workflows/jupyterlab.yaml index 4b26b1aca..66f25afb0 100644 --- a/.github/workflows/jupyterlab.yaml +++ b/.github/workflows/jupyterlab.yaml @@ -17,4 +17,6 @@ jobs: with: python-version: '3.11' - uses: jupyterlab/maintainer-tools/.github/actions/base-setup@v1 - - run: just jupyterlab ci + - run: just jupyterlab install + - run: just jupyterlab lint + - run: just jupyterlab test diff --git a/.github/workflows/positron.yaml b/.github/workflows/positron.yaml index e8d202109..4e47647d2 100644 --- a/.github/workflows/positron.yaml +++ b/.github/workflows/positron.yaml @@ -18,7 +18,9 @@ jobs: - uses: actions/setup-node@v3 with: node-version: 18.x - - run: just positron ci + - run: just positron install + - run: just positron lint + - run: just positron test docker: runs-on: ubuntu-latest steps: @@ -26,4 +28,6 @@ jobs: with: fetch-depth: 0 - uses: ./.github/actions/setup - - run: just positron ci + - run: just positron install + - run: just positron lint + - run: just positron test diff --git a/.github/workflows/web.yaml b/.github/workflows/web.yaml index a01ed20b2..1fc733265 100644 --- a/.github/workflows/web.yaml +++ b/.github/workflows/web.yaml @@ -9,4 +9,6 @@ jobs: with: fetch-depth: 0 - uses: ./.github/actions/setup - - run: just web ci + - run: just web install + - run: just web lint + - run: just web test diff --git a/extensions/jupyterlab/connect_jupyterlab/justfile b/extensions/jupyterlab/connect_jupyterlab/justfile index 5dd5ff9af..a93043dbc 100644 --- a/extensions/jupyterlab/connect_jupyterlab/justfile +++ b/extensions/jupyterlab/connect_jupyterlab/justfile @@ -10,16 +10,6 @@ _with_debug := if _debug == "true" { "" } -# Executes continuous integration workflow (i.e., this is what GitHub Actions uses) -ci: - #!/usr/bin/env bash - set -eou pipefail - {{ _with_debug }} - - just install - just lint - just test - default: #!/usr/bin/env bash set -eou pipefail diff --git a/extensions/positron/justfile b/extensions/positron/justfile index e0fae0c1d..0fff95744 100644 --- a/extensions/positron/justfile +++ b/extensions/positron/justfile @@ -12,14 +12,13 @@ _with_debug := if _debug == "true" { "" } -# Executes continuous integration workflow (i.e., this is what GitHub Actions uses) -ci: +# Quick start +default: #!/usr/bin/env bash set -eou pipefail {{ _with_debug }} just install - just lint just test # Deletes ephemeral project files (i.e., cleans the project). @@ -30,14 +29,6 @@ clean: rm -rf node_modules -default: - #!/usr/bin/env bash - set -eou pipefail - {{ _with_debug }} - - just install - just test - # Install dependencies install: diff --git a/justfile b/justfile index 406cb8f77..673e326e7 100644 --- a/justfile +++ b/justfile @@ -41,6 +41,16 @@ _uid_args := if os_family() == "unix" { "" } +# Quick start +default: + #!/usr/bin/env bash + set -eou pipefail + {{ _with_debug }} + + just clean + just web + just build + # Executes command against every justfile where avaiable. WARNING your mileage may very. all +args='default': #!/usr/bin/env bash @@ -71,16 +81,6 @@ build: just _with_docker env MODE={{ _mode }} ./scripts/build.bash {{ _cmd }} -# Executes continuous integration workflow (i.e., this is what GitHub Actions uses) -ci: - #!/usr/bin/env bash - set -eou pipefail - {{ _with_debug }} - - just install - just lint - just test - # Deletes ephemeral project files (i.e., cleans the project). clean: #!/usr/bin/env bash @@ -105,16 +105,6 @@ cy *args: just _with_docker just test/cy/{{ args }} -# Quick start -default: - #!/usr/bin/env bash - set -eou pipefail - {{ _with_debug }} - - just clean - just web - just build - # Prints the executable path for this operating system. It may not exist yet (see `just build`). executable-path: #!/usr/bin/env bash diff --git a/test/bats/justfile b/test/bats/justfile index db32111ec..4d995c1ac 100644 --- a/test/bats/justfile +++ b/test/bats/justfile @@ -12,8 +12,7 @@ _with_debug := if _debug == "true" { "" } -# Executes continuous integration workflow (i.e., this is what GitHub Actions uses) -ci: +default: #!/usr/bin/env bash set -eou pipefail {{ _with_debug }} @@ -29,14 +28,6 @@ clean: rm -rf node_modules -default: - #!/usr/bin/env bash - set -eou pipefail - {{ _with_debug }} - - just clean - just install - just test # Install dependencies install: diff --git a/test/cy/justfile b/test/cy/justfile index 551d7dd64..e0a35a9bd 100644 --- a/test/cy/justfile +++ b/test/cy/justfile @@ -12,14 +12,12 @@ _with_debug := if _debug == "true" { "" } -# Executes continuous integration workflow (i.e., this is what GitHub Actions uses) -ci: +default: #!/usr/bin/env bash set -eou pipefail {{ _with_debug }} just install - just lint just test # Deletes ephemeral project files (i.e., cleans the project). @@ -30,15 +28,6 @@ clean: rm -rf node_modules -default: - #!/usr/bin/env bash - set -eou pipefail - {{ _with_debug }} - - just clean - just install - just test - fix: #!/usr/bin/env bash set -eou pipefail diff --git a/web/justfile b/web/justfile index 58ae54fee..7a2ef5900 100644 --- a/web/justfile +++ b/web/justfile @@ -19,15 +19,15 @@ _with_debug := if _debug == "true" { "" } -# Executes continuous integration workflow (i.e., this is what GitHub Actions uses) -ci: +default: #!/usr/bin/env bash set -eou pipefail {{ _with_debug }} + just clean just install - just lint - just test + just build + # Compiles the static assests for the web client. Static assets are written to `./web/dist`. build: @@ -47,16 +47,6 @@ clean: rm -rf dist rm -rf node_modules -default: - #!/usr/bin/env bash - set -eou pipefail - {{ _with_debug }} - - just clean - just install - just build - - # Launch a local web server instance with hot-reloads. dev: #!/usr/bin/env bash