Merge pull request #589 from splitgraph/bugfix/sgr-cloud-sync-visibility

Bugfix/sgr cloud sync visibility
splitgraph · Dec 20, 2021 · 7ad1c49 · 7ad1c49
2 parents fb8bbc6 + 6db4241
commit 7ad1c49
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 19 deletions.
diff --git a/.ci/build_docs.sh b/.ci/build_docs.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+CI_DIR=$(cd -P -- "$(dirname -- "$0")" && pwd -P)
+REPO_ROOT_DIR="${CI_DIR}/.."
+
+source "$HOME"/.poetry/env
+
+pushd "$REPO_ROOT_DIR" \
+    && poetry run "$CI_DIR"/prepare_doc_bundle.sh \
+    && popd \
+    && exit 0
+
+exit 1
diff --git a/.ci/build_artifacts.sh → .ci/build_wheel.sh b/.ci/build_artifacts.sh → .ci/build_wheel.sh
@@ -18,7 +18,6 @@ pushd "$REPO_ROOT_DIR" \
     && poetry config http-basic.testpypi splitgraph "$PYPI_PASSWORD" \
     && poetry config http-basic.pypi splitgraph "$PYPI_PASSWORD" \
     && poetry build \
-    && poetry run "$CI_DIR"/prepare_doc_bundle.sh \
     && popd \
     && exit 0
 

diff --git a/.github/workflows/build_and_test_and_release.yml b/.github/workflows/build_and_test_and_release.yml
@@ -80,27 +80,41 @@ jobs:
         run: |
           source "$HOME"/.poetry/env
           poetry run coveralls --service=github
-      - name: "Build doc / Asciicast bundle and push out Docker engine (tags only)"
-        if: "startsWith(github.ref, 'refs/tags/')"
+      - name: "Push out Docker engine (tags only)"
+        if: "startsWith(github.ref, 'refs/tags/') && !contains(github.event.head_commit.message, '[skip engine]')"
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+          DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+        run: |
+          echo "Uploading engine image to Docker Hub"
+          ./.ci/push_engine.sh
+      - name: "Build doc / Asciicast bundle"
+        if: "startsWith(github.ref, 'refs/tags/') && !contains(github.event.head_commit.message, '[skip docs]')"
         env:
           SG_DEMO_KEY: ${{ secrets.SG_DEMO_KEY }}
           SG_DEMO_SECRET: ${{ secrets.SG_DEMO_SECRET }}
           DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
           PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-        # We could split this out into a separate stage but it would mean installing Poetry, Compose and this package all over again.
         run: |
           echo "Building Asciicast/doc bundle"
           export PATH=$PATH:$(readlink -f $DBT_VENV/bin)
-          ./.ci/build_artifacts.sh
-          echo "Uploading engine image to Docker Hub"
-          ./.ci/push_engine.sh
+          ./.ci/build_docs.sh
+          cp ./install.sh dist
+          # TODO figure out if we want to do poetry upload here (can only do once, so will fail
+          # if we're retrying an upload)
+          # "$HOME"/.poetry/bin/poetry build
+      - name: "Build and publish wheel"
+        if: "startsWith(github.ref, 'refs/tags/') && !contains(github.event.head_commit.message, '[skip wheel]')"
+        env:
+          PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
+        # We could split this out into a separate stage but it would mean installing Poetry, Compose and this package all over again.
+        run: |
+          ./.ci/build_wheel.sh
           cp ./install.sh dist
-          # TODO figure out if we want to do poetry upload here
+          # TODO figure out if we want to do poetry upload here (can only do once, so will fail
+          # if we're retrying an upload)
           # "$HOME"/.poetry/bin/poetry build
-          # Currently upload is commented out since it's once-only and we love
-          # republishing v0.1.0 for now.
-          # "$HOME"/.poetry/bin/poetry publish -r testpypi
       - name: "Upload release artifacts"
         uses: actions/upload-artifact@v2
         with:

diff --git a/splitgraph/cloud/__init__.py b/splitgraph/cloud/__init__.py
@@ -998,9 +998,7 @@ def start_load_params(
                 for tn, to in external.tables.items()
             ],
             "sync": sync,
-            "initialVisibility": (
-                "RepositoryVisibility.PRIVATE" if initial_private else "RepositoryVisibility.PUBLIC"
-            ),
+            "initialVisibility": ("PRIVATE" if initial_private else "PUBLIC"),
         }
 
         if credential_data:

diff --git a/test/splitgraph/commandline/http_fixtures.py b/test/splitgraph/commandline/http_fixtures.py
@@ -766,11 +766,7 @@ def _gql_callback(request, uri, response_headers):
                     ],
                     "sync": True,
                     "credentialData": '{"username": "my_username", "password": "secret"}',
-                    "initialVisibility": (
-                        "RepositoryVisibility.PRIVATE"
-                        if initial_private
-                        else "RepositoryVisibility.PUBLIC"
-                    ),
+                    "initialVisibility": ("PRIVATE" if initial_private else "PUBLIC"),
                 }
             return [
                 200,