Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test ci #40

Merged
merged 9 commits into from
Mar 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/workflows/publish-pkg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ jobs:
uses: actions/setup-node@v2
with:
node-version: '18'
registry-url: https://registry.npmjs.org/

- name: Install pnpm
run: npm install -g pnpm
Expand Down
2 changes: 1 addition & 1 deletion packages/component-interface/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@serverless-devs/component-interface",
"version": "0.0.3-beta.2",
"version": "0.0.4",
"description": "request for serverless-devs",
"main": "lib/index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/component-interface/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export interface IInputs {
access: string; // 访问秘钥名
};
getCredential: () => Promise<ICredentials | any>; // 获取用户秘钥
args: [];
args: string[];
cwd: string;
outputs?: Record<string, any>;
}
2 changes: 1 addition & 1 deletion packages/credential/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@serverless-devs/credential",
"version": "0.0.5",
"version": "0.0.6-beta.1",
"description": "credential for serverless-devs",
"main": "lib/index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/credential/src/actions/set/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ export default class SetCredential {
}
set(credInformation, 'AccountID', accountId);
} catch (ex: any) {
Logger.logger.warn(ex.data.Message);
Logger.logger.warn(get(ex, 'data.Message'));
Logger.logger.warn('Please make sure provided access is legal, or serverless-devs service on Cloud Providers may fail.');
if (!uid) {
throw ex;
Expand Down
2 changes: 1 addition & 1 deletion packages/engine/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@serverless-devs/engine",
"version": "0.1.1",
"version": "0.1.2-beta.4",
"description": "a engine lib for serverless-devs",
"main": "lib/index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/load-application/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@serverless-devs/load-application",
"version": "0.0.12",
"version": "0.0.13-beta.1",
"description": "load application for serverless-devs",
"main": "lib/index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/load-component/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@serverless-devs/load-component",
"version": "0.0.7-beta.1",
"version": "0.0.7-beta.2",
"description": "request for serverless-devs",
"main": "lib/index.js",
"scripts": {
Expand Down
2 changes: 2 additions & 0 deletions packages/load-component/src/utils/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ export const buildComponentInstance = async (componentPath: string, params?: any
if (componentInstance) {
componentInstance.__path = componentPath;
const publishData = getYamlContent(path.join(componentPath, 'publish.yaml'));
const schema = get(publishData, 'Schema');
componentInstance.schemaPath = schema ? path.join(componentPath, schema) : undefined;
const version = get(publishData, 'Version');
if (version) {
componentInstance.__version = version;
Expand Down
2 changes: 1 addition & 1 deletion packages/logger/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@serverless-devs/logger",
"version": "0.0.4",
"version": "0.0.5-beta.1",
"description": "",
"main": "lib/index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion packages/logger/src/engine-logger/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ export default class EngineLogger extends Logger {
}
// TODO: 仅提示但不报错
tips(message: string, tips?: string) {
let msg = `\n${chalk.hex('#000').bgYellow('WARNING:')}\n\n${message}\n`;
let msg = `\n${chalk.hex('#000').bgYellow('TIPS:')}\n\n${message}\n`;
if (tips) {
msg += `\n${chalk.gray(tips)}\n`;
}
Expand Down
2 changes: 1 addition & 1 deletion packages/parse-spec/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@serverless-devs/parse-spec",
"version": "0.0.25",
"version": "0.0.26-beta.1",
"description": "a parse yaml spec lib for serverless-devs",
"main": "lib/index.js",
"scripts": {
Expand Down
12 changes: 5 additions & 7 deletions packages/parse-spec/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -285,14 +285,12 @@ class ParseSpec {
debug(`find flow: ${JSON.stringify(flowObj)}`);
const projectOrder = {} as Record<string, number>;
const fn = (projects: string[] = [], index: number) => {
assert(isArray(projects), `flow ${this.record.command} data format is invalid`);
assert(isArray(projects), `flow ${this.record.command} data format is invalid.`);
for (const project of projects) {
for (const step of steps) {
if (project === step.projectName) {
newSteps.push({ ...step, flowId: index });
projectOrder[step.projectName] = index;
}
}
const step = find(steps, item => item.projectName === project);
assert(step, `Resource ${project} is not found. Please check the content of flow.`);
newSteps.push({ ...step, flowId: index });
projectOrder[step.projectName] = index;
}
};
each(flowObj, fn);
Expand Down
Loading