Skip to content

Commit

Permalink
fix: add estuary to config
Browse files Browse the repository at this point in the history 
Use ci.config.json to use forked estuary version
  • Loading branch information
@diogomatsubara
diogomatsubara committed Sep 20, 2024
1 parent 536043e commit 49e21e4
Show file tree
Hide file tree
Showing 11 changed files with 26 additions and 15 deletions.
8 changes: 7 additions & 1 deletion ci.config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@
"estuary": "0.1.1",
"cross": "0.2.5",
"toml-cli2": "0.3.2"
},
"git": {
"estuary": {
"url": "https://github.com/fuzzypixelz/estuary.git",
"branch": "main"
}
}
}
}
}
2 changes: 1 addition & 1 deletion dist/build-crates-debian-main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127670,7 +127670,7 @@ __nccwpck_require__.d(__webpack_exports__, {
// UNUSED EXPORTS: gitEnv

;// CONCATENATED MODULE: ./ci.config.json
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"}}}');
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"},"git":{"estuary":{"url":"https://github.com/fuzzypixelz/estuary.git","branch":"main"}}}}');
;// CONCATENATED MODULE: ./src/config.ts

const config = ci_config_namespaceObject;
Expand Down
2 changes: 1 addition & 1 deletion dist/build-crates-standalone-main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127654,7 +127654,7 @@ __nccwpck_require__.d(__webpack_exports__, {
// UNUSED EXPORTS: gitEnv

;// CONCATENATED MODULE: ./ci.config.json
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"}}}');
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"},"git":{"estuary":{"url":"https://github.com/fuzzypixelz/estuary.git","branch":"main"}}}}');
;// CONCATENATED MODULE: ./src/config.ts

const config = ci_config_namespaceObject;
Expand Down
2 changes: 1 addition & 1 deletion dist/bump-crates-main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81375,7 +81375,7 @@ __nccwpck_require__.d(__webpack_exports__, {
});

;// CONCATENATED MODULE: ./ci.config.json
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"}}}');
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"},"git":{"estuary":{"url":"https://github.com/fuzzypixelz/estuary.git","branch":"main"}}}}');
;// CONCATENATED MODULE: ./src/config.ts

const config = ci_config_namespaceObject;
Expand Down
8 changes: 4 additions & 4 deletions dist/publish-crates-cargo-main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81264,7 +81264,7 @@ __nccwpck_require__.d(__webpack_exports__, {
// UNUSED EXPORTS: gitEnv

;// CONCATENATED MODULE: ./ci.config.json
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"}}}');
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"},"git":{"estuary":{"url":"https://github.com/fuzzypixelz/estuary.git","branch":"main"}}}}');
;// CONCATENATED MODULE: ./src/config.ts

const config = ci_config_namespaceObject;
Expand Down Expand Up @@ -81297,6 +81297,7 @@ __nccwpck_require__.a(module, async (__webpack_handle_async_dependencies__, __we
/* harmony import */ var _actions_core__WEBPACK_IMPORTED_MODULE_4__ = __nccwpck_require__(2186);
/* harmony import */ var _actions_core__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__nccwpck_require__.n(_actions_core__WEBPACK_IMPORTED_MODULE_4__);
/* harmony import */ var _cargo__WEBPACK_IMPORTED_MODULE_5__ = __nccwpck_require__(8683);
/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_6__ = __nccwpck_require__(98);
var __webpack_async_dependencies__ = __webpack_handle_async_dependencies__([_cargo__WEBPACK_IMPORTED_MODULE_5__]);
_cargo__WEBPACK_IMPORTED_MODULE_5__ = (__webpack_async_dependencies__.then ? (await __webpack_async_dependencies__)() : __webpack_async_dependencies__)[0];

Expand All @@ -81305,14 +81306,13 @@ _cargo__WEBPACK_IMPORTED_MODULE_5__ = (__webpack_async_dependencies__.then ? (aw




const name = "estuary";
const baseUrl = "http://localhost:7878";
const index = `${baseUrl}/git/index`;
const token = "0000";
const indexPath = "index";
const cratePath = "crate";
const gitUrl = "https://github.com/fuzzypixelz/estuary.git";
const gitBranch = "main";
async function spawn() {
const tmp = await (0,fs_promises__WEBPACK_IMPORTED_MODULE_1__.mkdtemp)((0,path__WEBPACK_IMPORTED_MODULE_3__.join)((0,os__WEBPACK_IMPORTED_MODULE_2__.tmpdir)(), name));
const indexDir = (0,path__WEBPACK_IMPORTED_MODULE_3__.join)(tmp, indexPath);
Expand All @@ -81324,7 +81324,7 @@ async function spawn() {
},
stdio: "inherit",
};
await _cargo__WEBPACK_IMPORTED_MODULE_5__/* .installBinaryCached */ .Mj(name, { gitUrl: gitUrl, gitBranch: gitBranch });
await _cargo__WEBPACK_IMPORTED_MODULE_5__/* .installBinaryCached */ .Mj(name, { gitUrl: _config__WEBPACK_IMPORTED_MODULE_6__/* .config.lock.git.estuary.url */ .v.lock.git.estuary.url, gitBranch: _config__WEBPACK_IMPORTED_MODULE_6__/* .config.lock.git.estuary.branch */ .v.lock.git.estuary.branch });
const proc = child_process__WEBPACK_IMPORTED_MODULE_0__.spawn("estuary", ["--base-url", baseUrl, "--crate-dir", crateDir, "--index-dir", indexDir], options);
_actions_core__WEBPACK_IMPORTED_MODULE_4__.info(`Spawned estuary (${proc.pid}) with base URL ${baseUrl} and data directory ${tmp}`);
return { name, index, token, crateDir, indexDir, proc };
Expand Down
2 changes: 1 addition & 1 deletion dist/publish-crates-debian-main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127649,7 +127649,7 @@ __nccwpck_require__.d(__webpack_exports__, {
// UNUSED EXPORTS: gitEnv

;// CONCATENATED MODULE: ./ci.config.json
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"}}}');
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"},"git":{"estuary":{"url":"https://github.com/fuzzypixelz/estuary.git","branch":"main"}}}}');
;// CONCATENATED MODULE: ./src/config.ts

const config = ci_config_namespaceObject;
Expand Down
2 changes: 1 addition & 1 deletion dist/publish-crates-eclipse-main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127751,7 +127751,7 @@ __nccwpck_require__.d(__webpack_exports__, {
// UNUSED EXPORTS: gitEnv

;// CONCATENATED MODULE: ./ci.config.json
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"}}}');
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"},"git":{"estuary":{"url":"https://github.com/fuzzypixelz/estuary.git","branch":"main"}}}}');
;// CONCATENATED MODULE: ./src/config.ts

const config = ci_config_namespaceObject;
Expand Down
2 changes: 1 addition & 1 deletion dist/publish-crates-github-main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127730,7 +127730,7 @@ __nccwpck_require__.d(__webpack_exports__, {
// UNUSED EXPORTS: gitEnv

;// CONCATENATED MODULE: ./ci.config.json
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"}}}');
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"},"git":{"estuary":{"url":"https://github.com/fuzzypixelz/estuary.git","branch":"main"}}}}');
;// CONCATENATED MODULE: ./src/config.ts

const config = ci_config_namespaceObject;
Expand Down
2 changes: 1 addition & 1 deletion dist/publish-crates-homebrew-main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127654,7 +127654,7 @@ __nccwpck_require__.d(__webpack_exports__, {
});

;// CONCATENATED MODULE: ./ci.config.json
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"}}}');
const ci_config_namespaceObject = JSON.parse('{"git":{"user":{"name":"eclipse-zenoh-bot","email":"[email protected]"}},"lock":{"cratesio":{"cargo-deb":"2.1.0","estuary":"0.1.1","cross":"0.2.5","toml-cli2":"0.3.2"},"git":{"estuary":{"url":"https://github.com/fuzzypixelz/estuary.git","branch":"main"}}}}');
;// CONCATENATED MODULE: ./src/config.ts

const config = ci_config_namespaceObject;
Expand Down
6 changes: 6 additions & 0 deletions src/config.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,12 @@ type Config = {
cratesio: {
[key: string]: string;
};
git: {
estuary: {
url: string;
branch: string;
};
};
};
};

Expand Down
5 changes: 2 additions & 3 deletions src/estuary.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@ import { join } from "path";
import * as core from "@actions/core";

import * as cargo from "./cargo";
import { config } from "./config"

const name = "estuary";
const baseUrl = "http://localhost:7878";
const index = `${baseUrl}/git/index`;
const token = "0000";
const indexPath = "index";
const cratePath = "crate";
const gitUrl = "https://github.com/fuzzypixelz/estuary.git";
const gitBranch = "main";

export type Estuary = {
name: string;
Expand All @@ -38,7 +37,7 @@ export async function spawn(): Promise<Estuary> {
stdio: "inherit",
} as child_process.SpawnOptions;

await cargo.installBinaryCached(name, { gitUrl: gitUrl, gitBranch: gitBranch });
await cargo.installBinaryCached(name, { gitUrl: config.lock.git.estuary.url, gitBranch: config.lock.git.estuary.branch });

const proc = child_process.spawn(
"estuary",
Expand Down

0 comments on commit 49e21e4

Please sign in to comment.