From d77f13354bf2754366767d1321830eb1151922a6 Mon Sep 17 00:00:00 2001 From: Devin Stein Date: Mon, 2 Jan 2023 06:12:51 -0800 Subject: [PATCH 1/4] fix: include requirements.txt in manifest --- autovizwidget/MANIFEST.in | 1 + hdijupyterutils/MANIFEST.in | 2 ++ sparkmagic/MANIFEST.in | 1 + 3 files changed, 4 insertions(+) create mode 100644 autovizwidget/MANIFEST.in create mode 100644 hdijupyterutils/MANIFEST.in diff --git a/autovizwidget/MANIFEST.in b/autovizwidget/MANIFEST.in new file mode 100644 index 000000000..f9bd1455b --- /dev/null +++ b/autovizwidget/MANIFEST.in @@ -0,0 +1 @@ +include requirements.txt diff --git a/hdijupyterutils/MANIFEST.in b/hdijupyterutils/MANIFEST.in new file mode 100644 index 000000000..1ccd8194c --- /dev/null +++ b/hdijupyterutils/MANIFEST.in @@ -0,0 +1,2 @@ +include requirements.txt + diff --git a/sparkmagic/MANIFEST.in b/sparkmagic/MANIFEST.in index 9ccc86a63..094d6818f 100644 --- a/sparkmagic/MANIFEST.in +++ b/sparkmagic/MANIFEST.in @@ -1 +1,2 @@ recursive-include sparkmagic/kernels *.js *.json +include requirements.txt From 0872548988727b2abbfb8e2184e2af890c52b4c2 Mon Sep 17 00:00:00 2001 From: Devin Stein Date: Mon, 2 Jan 2023 06:18:09 -0800 Subject: [PATCH 2/4] fix: build from local --- .github/workflows/docker_build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml index 1c875c877..f122fa16f 100644 --- a/.github/workflows/docker_build.yml +++ b/.github/workflows/docker_build.yml @@ -23,4 +23,4 @@ jobs: - name: Run docker compose build run: | - docker compose build + docker compose build --build-arg dev_mode="true" From 33386fdb2d3e22a6caf4bbf4652ccfcaae3bbb66 Mon Sep 17 00:00:00 2001 From: Devin Stein Date: Mon, 2 Jan 2023 06:28:25 -0800 Subject: [PATCH 3/4] fix: run build from local files on push, from pip on schedule --- .github/workflows/docker_build.yml | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml index f122fa16f..1ed10650f 100644 --- a/.github/workflows/docker_build.yml +++ b/.github/workflows/docker_build.yml @@ -10,17 +10,21 @@ jobs: docker: runs-on: ubuntu-latest steps: - - - name: Checkout + - name: Checkout uses: actions/checkout@v3 - - - name: Set up QEMU + + - name: Set up QEMU uses: docker/setup-qemu-action@v2 - - - name: Set up Docker Buildx + + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - - name: Run docker compose build + - if: github.event_name == "push" + name: Run docker compose build with local packages run: | docker compose build --build-arg dev_mode="true" + + - if: github.event_name == "schedule" + name: Run docker compose build with latest release + run: | + docker compose build From fcde12d6a1641509bfff0055efd6b8d12dbf7551 Mon Sep 17 00:00:00 2001 From: Devin Stein Date: Mon, 2 Jan 2023 06:33:09 -0800 Subject: [PATCH 4/4] fix: ->'" --- .github/workflows/docker_build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml index 1ed10650f..f172002ce 100644 --- a/.github/workflows/docker_build.yml +++ b/.github/workflows/docker_build.yml @@ -19,12 +19,12 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - - if: github.event_name == "push" + - if: github.event_name == 'push' name: Run docker compose build with local packages run: | docker compose build --build-arg dev_mode="true" - - if: github.event_name == "schedule" + - if: github.event_name == 'schedule' name: Run docker compose build with latest release run: | docker compose build