From 08db707cbb449af6623f77a08860a0e5497d5b49 Mon Sep 17 00:00:00 2001 From: robertlincecum Date: Thu, 7 Mar 2024 15:34:16 -0600 Subject: [PATCH 1/3] add initial cicd --- .github/workflows/branch-build.yml | 20 +++++++ .github/workflows/cut-release.yml | 25 ++++++++ .github/workflows/dev-build.yml | 19 +++++++ .github/workflows/patch.yml | 19 +++++++ package-lock.json | 91 ++++++++++++++++++++++++++++++ package.json | 5 +- 6 files changed, 177 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/branch-build.yml create mode 100644 .github/workflows/cut-release.yml create mode 100644 .github/workflows/dev-build.yml create mode 100644 .github/workflows/patch.yml diff --git a/.github/workflows/branch-build.yml b/.github/workflows/branch-build.yml new file mode 100644 index 00000000..9f66c728 --- /dev/null +++ b/.github/workflows/branch-build.yml @@ -0,0 +1,20 @@ +name: Auto Version Branch Workflow +on: + pull_request: + types: [closed] + branches: + - 'v?[0-9]+.[0-9]+' +jobs: + call-common-workflow: + uses: dominant-strategies/quai-cicd/.github/workflows/deploy-sandbox-common.yml@main + with: + needs_build: true + install_command: "npm ci" + build_command": "npm run build-dist" + cloud_deploy: false + skip_deploy: true + update_version: false + needs_docker: false + secrets: + GH_PAT: ${{ secrets.GH_PAT }} + BUILD_ARGS: '' diff --git a/.github/workflows/cut-release.yml b/.github/workflows/cut-release.yml new file mode 100644 index 00000000..58f9bc17 --- /dev/null +++ b/.github/workflows/cut-release.yml @@ -0,0 +1,25 @@ +name: Cut Release +on: + workflow_dispatch: + inputs: + branch: + description: 'Branch to use' + required: true + default: 'main' +jobs: + call-common-workflow: + uses: dominant-strategies/quai-cicd/.github/workflows/cut-release-common.yml@main + with: + branch: main + needs_build: true + needs_docker: false + install_command: "npm ci" + build_command: "npm run build-dist" + cloud_deploy: false + skip_deploy: true + update_version: true + secrets: + GH_PAT: ${{ secrets.GH_PAT }} + BUILD_ARGS: '' + GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY2 }} + GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }} diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml new file mode 100644 index 00000000..c27b2101 --- /dev/null +++ b/.github/workflows/dev-build.yml @@ -0,0 +1,19 @@ +name: Auto Dev Workflow +on: + pull_request: + types: [closed] + branches: [ "main" ] +jobs: + call-common-workflow: + uses: dominant-strategies/quai-cicd/.github/workflows/deploy-dev-common.yml@main + with: + needs_build: true + install_command: "npm ci" + build_command: "npm run build-dist" + cloud_deploy: false + skip_deploy: true + update_version: false + needs_docker: false + secrets: + GH_PAT: ${{ secrets.GH_PAT }} + BUILD_ARGS: '' diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml new file mode 100644 index 00000000..d44c9c0a --- /dev/null +++ b/.github/workflows/patch.yml @@ -0,0 +1,19 @@ +name: Deploy to Garden +on: workflow_dispatch +jobs: + call-common-workflow: + uses: dominant-strategies/quai-cicd/.github/workflows/deploy-sandbox-common.yml@main + with: + needs_build: true + needs_docker: false + install_command: "npm ci" + build_command: "npm run build-dist" + cloud_deploy: false + skip_deploy: true + update_version: true + secrets: + GH_PAT: ${{ secrets.GH_PAT }} + BUILD_ARGS: '' + GPG_PRIVATE_KEY: ${{ secrets.GPG_PRIVATE_KEY2 }} + GPG_KEY_ID: ${{ secrets.GPG_KEY_ID }} + GH_GCP_TOKEN: ${{ secrets.GH_GCP_TOKEN }} diff --git a/package-lock.json b/package-lock.json index e82c90d7..4490c279 100644 --- a/package-lock.json +++ b/package-lock.json @@ -14,6 +14,7 @@ "@noble/hashes": "1.3.2", "@types/node": "18.15.13", "aes-js": "4.0.0-beta.5", + "axios": "^1.6.7", "dotenv": "^16.4.1", "tslib": "2.4.0", "ws": "8.5.0" @@ -245,6 +246,21 @@ "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "dev": true }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + }, + "node_modules/axios": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", + "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", + "dependencies": { + "follow-redirects": "^1.15.4", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -409,6 +425,17 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "dev": true }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -479,6 +506,14 @@ "node": ">=0.10.0" } }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "engines": { + "node": ">=0.4.0" + } + }, "node_modules/diff": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz", @@ -569,6 +604,25 @@ "flat": "cli.js" } }, + "node_modules/follow-redirects": { + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, "node_modules/foreground-child": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", @@ -582,6 +636,19 @@ "node": ">=8.0.0" } }, + "node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/fs.realpath": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", @@ -943,6 +1010,25 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, "node_modules/minimatch": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz", @@ -1131,6 +1217,11 @@ "url": "https://github.com/sponsors/jonschlinkert" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", diff --git a/package.json b/package.json index 964be71e..cba707aa 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "@noble/hashes": "1.3.2", "@types/node": "18.15.13", "aes-js": "4.0.0-beta.5", + "axios": "^1.6.7", "dotenv": "^16.4.1", "tslib": "2.4.0", "ws": "8.5.0" @@ -83,7 +84,7 @@ "default": "./lib.commonjs/wordlists/index.js" } }, - "gitHead": "f3e4f59d2e076da4483e1c45a54d728972b59066", + "gitHead": "3bd0bf5b077f4aa5fab480474e3982e50e1af506", "homepage": "https://qu.ai", "keywords": [ "quainetwork", @@ -108,7 +109,7 @@ "auto-build": "npm run build -- -w", "build": "tsc --project tsconfig.esm.json", "build-all": "npm run build && npm run build-commonjs", - "build-clean": "npm run clean && npm run build && node lib.esm/_admin/update-version.js && node lib.esm/_admin/update-changelog.js && npm run build-all && npm run _build-dist && npm run _dist-stats", + "build-clean": "npm run clean && npm run build && npm run build-all && npm run _build-dist && npm run _dist-stats", "build-commonjs": "tsc --project tsconfig.commonjs.json", "build-dist": "npm run build && npm run _build-dist && npm run _dist-stats", "clean": "rm -rf dist lib.esm lib.commonjs && cp -r misc/basedirs/* .", From b2f4196b3ec80994a3443f31f96f876e317518bd Mon Sep 17 00:00:00 2001 From: robertlincecum Date: Thu, 7 Mar 2024 15:45:47 -0600 Subject: [PATCH 2/3] use build-clean --- .github/workflows/branch-build.yml | 2 +- .github/workflows/cut-release.yml | 2 +- .github/workflows/dev-build.yml | 2 +- .github/workflows/patch.yml | 2 +- package.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/branch-build.yml b/.github/workflows/branch-build.yml index 9f66c728..6d338b74 100644 --- a/.github/workflows/branch-build.yml +++ b/.github/workflows/branch-build.yml @@ -10,7 +10,7 @@ jobs: with: needs_build: true install_command: "npm ci" - build_command": "npm run build-dist" + build_command": "npm run build-clean" cloud_deploy: false skip_deploy: true update_version: false diff --git a/.github/workflows/cut-release.yml b/.github/workflows/cut-release.yml index 58f9bc17..bf4284e0 100644 --- a/.github/workflows/cut-release.yml +++ b/.github/workflows/cut-release.yml @@ -14,7 +14,7 @@ jobs: needs_build: true needs_docker: false install_command: "npm ci" - build_command: "npm run build-dist" + build_command: "npm run build-clean" cloud_deploy: false skip_deploy: true update_version: true diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index c27b2101..be18d039 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -9,7 +9,7 @@ jobs: with: needs_build: true install_command: "npm ci" - build_command: "npm run build-dist" + build_command: "npm run build-clean" cloud_deploy: false skip_deploy: true update_version: false diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index d44c9c0a..8d39cef2 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -7,7 +7,7 @@ jobs: needs_build: true needs_docker: false install_command: "npm ci" - build_command: "npm run build-dist" + build_command: "npm run build-clean" cloud_deploy: false skip_deploy: true update_version: true diff --git a/package.json b/package.json index cba707aa..25f65c55 100644 --- a/package.json +++ b/package.json @@ -122,5 +122,5 @@ "test-esm": "mocha --trace-warnings --reporter ./reporter.cjs ./lib.esm/_tests/test-*.js" }, "sideEffects": false, - "version": "0.0.1" + "version": "v0.0.1-pre" } From 83927a1b003170829ab6bc3da587ebe1fd96fcb9 Mon Sep 17 00:00:00 2001 From: robertlincecum Date: Thu, 7 Mar 2024 15:51:04 -0600 Subject: [PATCH 3/3] use master not main and move old workflows to legacy-workflows for now --- .github/{workflows => legacy-workflows}/generate-docs.yml | 2 +- .github/{workflows => legacy-workflows}/test-browser.yml | 0 .github/{workflows => legacy-workflows}/test-ci.yml | 0 .github/{workflows => legacy-workflows}/test-env.yml | 0 .github/workflows/cut-release.yml | 2 +- .github/workflows/dev-build.yml | 2 +- 6 files changed, 3 insertions(+), 3 deletions(-) rename .github/{workflows => legacy-workflows}/generate-docs.yml (97%) rename .github/{workflows => legacy-workflows}/test-browser.yml (100%) rename .github/{workflows => legacy-workflows}/test-ci.yml (100%) rename .github/{workflows => legacy-workflows}/test-env.yml (100%) diff --git a/.github/workflows/generate-docs.yml b/.github/legacy-workflows/generate-docs.yml similarity index 97% rename from .github/workflows/generate-docs.yml rename to .github/legacy-workflows/generate-docs.yml index af04a0c0..dea273a7 100644 --- a/.github/workflows/generate-docs.yml +++ b/.github/legacy-workflows/generate-docs.yml @@ -1,4 +1,4 @@ -name: Generate Documentation +## name: Generate Documentation on: push: diff --git a/.github/workflows/test-browser.yml b/.github/legacy-workflows/test-browser.yml similarity index 100% rename from .github/workflows/test-browser.yml rename to .github/legacy-workflows/test-browser.yml diff --git a/.github/workflows/test-ci.yml b/.github/legacy-workflows/test-ci.yml similarity index 100% rename from .github/workflows/test-ci.yml rename to .github/legacy-workflows/test-ci.yml diff --git a/.github/workflows/test-env.yml b/.github/legacy-workflows/test-env.yml similarity index 100% rename from .github/workflows/test-env.yml rename to .github/legacy-workflows/test-env.yml diff --git a/.github/workflows/cut-release.yml b/.github/workflows/cut-release.yml index bf4284e0..69c8e225 100644 --- a/.github/workflows/cut-release.yml +++ b/.github/workflows/cut-release.yml @@ -5,7 +5,7 @@ on: branch: description: 'Branch to use' required: true - default: 'main' + default: 'master' jobs: call-common-workflow: uses: dominant-strategies/quai-cicd/.github/workflows/cut-release-common.yml@main diff --git a/.github/workflows/dev-build.yml b/.github/workflows/dev-build.yml index be18d039..d49010ac 100644 --- a/.github/workflows/dev-build.yml +++ b/.github/workflows/dev-build.yml @@ -2,7 +2,7 @@ name: Auto Dev Workflow on: pull_request: types: [closed] - branches: [ "main" ] + branches: [ "master" ] jobs: call-common-workflow: uses: dominant-strategies/quai-cicd/.github/workflows/deploy-dev-common.yml@main