fix: cope with getting moddable submodule from agoric-labs

Author: michaelfig

.github/workflows/docker.yml

@@ -14,16 +14,17 @@ jobs:
       run: echo "GIT_REVISION=$(git rev-parse HEAD)" >> $GITHUB_ENV
     - name: Save SDK_VERSION
       run: echo "SDK_VERSION=$(jq -r .version package.json)" >> $GITHUB_ENV
-    - name: Save MODDABLE_COMMIT_HASH
+    - name: Save MODDABLE_COMMIT_HASH, MODDABLE_URL
       run: |
         git submodule status packages/xsnap/moddable | \
         sed -ne 's/^.\([^ ]*\).*/MODDABLE_COMMIT_HASH=\1/p' >> $GITHUB_ENV
+        sed -ne 's!^.*url = \(https://.*moddable\.git\).*!MODDABLE_URL=\1!p' .gitmodules >> $GITHUB_ENV
     - name: Build SDK image
       uses: elgohr/Publish-Docker-Github-Action@master
       with:
         name: agoric/agoric-sdk
         dockerfile: packages/deployment/Dockerfile.sdk
-        buildargs: MODDABLE_COMMIT_HASH,GIT_REVISION
+        buildargs: MODDABLE_COMMIT_HASH,MODDABLE_URL,GIT_REVISION
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
         snapshot: true

packages/deployment/Dockerfile.sdk

@@ -15,6 +15,7 @@ RUN make GIT_REVISION="$GIT_REVISION" MOD_READONLY= compile-go
 # The js build container
 FROM node:12-buster AS build-js
 ARG MODDABLE_COMMIT_HASH
+ARG MODDABLE_URL
 
 WORKDIR /usr/src/agoric-sdk
 COPY . .
@@ -29,7 +30,7 @@ RUN cd golang/cosmos && yarn build:gyp
 RUN cd packages/cosmic-swingset && make install install-helper
 
 # Check out the specified Moddable SDK version.
-RUN MODDABLE_COMMIT_HASH="$MODDABLE_COMMIT_HASH" yarn build
+RUN MODDABLE_COMMIT_HASH="$MODDABLE_COMMIT_HASH" MODDABLE_URL="$MODDABLE_URL" yarn build
 
 # Remove dev dependencies.
 RUN rm -rf packages/xsnap/moddable

packages/deployment/Makefile

@@ -6,6 +6,7 @@ VERSION := $(shell node -e 'console.log(require("../../package.json").version)'
 TAG := $(if $(VERSION),$(VERSION),latest)
 MODDABLE_COMMIT_HASH := $(shell git submodule status ../xsnap/moddable | \
 	sed -ne 's/^.\([^ ]*\).*/\1/p')
+MODDABLE_URL := $(shell sed -ne 's!^.* = \(https://.*moddable\.git\).*!\1!p' ../../.gitmodules)
 GIT_REVISION := $(shell hash=$$(git rev-parse --short HEAD); \
 	dirty=`git diff --quiet || echo -dirty`; \
 	echo "$$hash$$dirty")
@@ -26,6 +27,7 @@ docker-build: docker-build-sdk docker-build-solo \
 
 docker-build-sdk:
 	docker build --build-arg=MODDABLE_COMMIT_HASH=$(MODDABLE_COMMIT_HASH) \
+		--build-arg=MODDABLE_URL=$(MODDABLE_URL) \
 		--build-arg=GIT_REVISION=$(GIT_REVISION) \
 		-t $(REPOSITORY_SDK):$(TAG) --file=Dockerfile.sdk ../..
 	docker tag $(REPOSITORY_SDK):$(TAG) $(REPOSITORY_SDK):latest

packages/xsnap/src/build.js

@@ -26,13 +26,16 @@ function exec(command, cwd, args = []) {
 (async () => {
   // Allow overriding of the checked-out version of the Moddable submodule.
   const moddableCommitHash = process.env.MODDABLE_COMMIT_HASH;
+  const moddableUrl =
+    process.env.MODDABLE_URL || 'https://github.com/agoric-labs/moddable.git';
 
   if (moddableCommitHash) {
     // Do the moral equivalent of submodule update when explicitly overriding.
     if (!existsSync('moddable')) {
       await exec('git', '.', [
         'clone',
-        'https://github.com/Moddable-OpenSource/moddable.git',
+        // NOTE: We need to depend on cloning from agoric-labs.
+        moddableUrl,
         'moddable',
       ]);
     }