From d8bc20f7820bdfd1817329457aa26d7925b40794 Mon Sep 17 00:00:00 2001 From: Ambrose Chua Date: Wed, 3 Jul 2019 10:38:06 +0800 Subject: [PATCH 1/2] Add hardcoded submodule list --- drone_gen.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drone_gen.js b/drone_gen.js index f1d3baf..f5303a1 100644 --- a/drone_gen.js +++ b/drone_gen.js @@ -5,14 +5,18 @@ const yaml = require('js-yaml'); const ini = require('ini'); const gitmodules = ini.parse(fs.readFileSync('.gitmodules', 'utf-8')); -const submodules = Object.values(gitmodules).map(m => m.path); +const gitmodulepaths = Object.values(gitmodules).map(m => m.path); /* const folders = fs.readdirSync(cwd, { withFileTypes: true }); const dockers = folders.filter(f => f.isDirectory() && fs.readdirSync(path.join(cwd, f.name)).includes('Dockerfile') ).map(f => f.name); */ -const dockers = submodules; // Assumption: All submodules have Docker. Should hold true +const submodules = gitmodulepaths.concat([ + // Additional nested submodules + 'backend-protobuf', +]); +const dockers = gitmodulepaths; // Assumption: All submodules have Docker. Should hold true const submodule_override = submodules.reduce((acc, f) => { acc[f] = 'https://git.makerforce.io/beep/' + f + '.git'; From 91cd23a99d020ced3b57b102ddc8e9268d4c95af Mon Sep 17 00:00:00 2001 From: ambrose Date: Wed, 3 Jul 2019 02:39:58 +0000 Subject: [PATCH 2/2] [SKIP CI] Automatically updating .drone.yml --- .drone.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.drone.yml b/.drone.yml index 93d260e..875a4be 100644 --- a/.drone.yml +++ b/.drone.yml @@ -62,6 +62,7 @@ steps: backend-pictures: 'https://git.makerforce.io/beep/backend-pictures.git' backend-permissions: 'https://git.makerforce.io/beep/backend-permissions.git' backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git' + backend-protobuf: 'https://git.makerforce.io/beep/backend-protobuf.git' - name: docker image: plugins/docker settings: @@ -102,6 +103,7 @@ steps: backend-pictures: 'https://git.makerforce.io/beep/backend-pictures.git' backend-permissions: 'https://git.makerforce.io/beep/backend-permissions.git' backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git' + backend-protobuf: 'https://git.makerforce.io/beep/backend-protobuf.git' - name: docker image: plugins/docker settings: @@ -142,6 +144,7 @@ steps: backend-pictures: 'https://git.makerforce.io/beep/backend-pictures.git' backend-permissions: 'https://git.makerforce.io/beep/backend-permissions.git' backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git' + backend-protobuf: 'https://git.makerforce.io/beep/backend-protobuf.git' - name: docker image: plugins/docker settings: @@ -182,6 +185,7 @@ steps: backend-pictures: 'https://git.makerforce.io/beep/backend-pictures.git' backend-permissions: 'https://git.makerforce.io/beep/backend-permissions.git' backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git' + backend-protobuf: 'https://git.makerforce.io/beep/backend-protobuf.git' - name: docker image: plugins/docker settings: @@ -222,6 +226,7 @@ steps: backend-pictures: 'https://git.makerforce.io/beep/backend-pictures.git' backend-permissions: 'https://git.makerforce.io/beep/backend-permissions.git' backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git' + backend-protobuf: 'https://git.makerforce.io/beep/backend-protobuf.git' - name: docker image: plugins/docker settings: @@ -262,6 +267,7 @@ steps: backend-pictures: 'https://git.makerforce.io/beep/backend-pictures.git' backend-permissions: 'https://git.makerforce.io/beep/backend-permissions.git' backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git' + backend-protobuf: 'https://git.makerforce.io/beep/backend-protobuf.git' - name: docker image: plugins/docker settings: @@ -302,6 +308,7 @@ steps: backend-pictures: 'https://git.makerforce.io/beep/backend-pictures.git' backend-permissions: 'https://git.makerforce.io/beep/backend-permissions.git' backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git' + backend-protobuf: 'https://git.makerforce.io/beep/backend-protobuf.git' - name: docker image: plugins/docker settings: @@ -342,6 +349,7 @@ steps: backend-pictures: 'https://git.makerforce.io/beep/backend-pictures.git' backend-permissions: 'https://git.makerforce.io/beep/backend-permissions.git' backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git' + backend-protobuf: 'https://git.makerforce.io/beep/backend-protobuf.git' - name: docker image: plugins/docker settings: @@ -382,6 +390,7 @@ steps: backend-pictures: 'https://git.makerforce.io/beep/backend-pictures.git' backend-permissions: 'https://git.makerforce.io/beep/backend-permissions.git' backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git' + backend-protobuf: 'https://git.makerforce.io/beep/backend-protobuf.git' - name: docker image: plugins/docker settings: @@ -420,6 +429,7 @@ steps: backend-pictures: 'https://git.makerforce.io/beep/backend-pictures.git' backend-permissions: 'https://git.makerforce.io/beep/backend-permissions.git' backend-webrtc: 'https://git.makerforce.io/beep/backend-webrtc.git' + backend-protobuf: 'https://git.makerforce.io/beep/backend-protobuf.git' - name: copy-docker-compose image: appleboy/drone-scp settings: