Skip to content

Commit

Permalink
chore: finalize Solo migration (#766)
Browse files Browse the repository at this point in the history
Signed-off-by: Nathan Klick <nathan@swirldslabs.com>
  • Loading branch information
nathanklick committed Feb 19, 2024
1 parent 029b31c commit b22d490
Show file tree
Hide file tree
Showing 82 changed files with 4 additions and 25,128 deletions.
1 change: 0 additions & 1 deletion .eslintrc.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ updates:
- package-ecosystem: "github-actions"
directory: "/"
schedule:
interval: "weekly"
open-pull-requests-limit: 5
interval: "daily"
open-pull-requests-limit: 15
- package-ecosystem: "docker"
directory: "/docker"
schedule:
interval: "weekly"
interval: "daily"
open-pull-requests-limit: 5
37 changes: 0 additions & 37 deletions .github/workflows/flow-deploy-release-artifact.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -259,44 +259,12 @@ jobs:
with:
node-version: 18

- name: Setup JFrog CLI
uses: jfrog/setup-jfrog-cli@8fc3d0018a8721b9a797cd7fd97c8e4833f5a3d1 # v3.5.3
env:
JF_URL: ${{ vars.JF_URL }}
JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }}

- name: Show JFrog Config
run: jfrog config show

- name: Verify JFrog Connectivity
run: jfrog rt ping

- name: Setup JFrog NPM Repository
working-directory: solo
run: |
jf npmc --server-id-resolve setup-jfrog-cli-server --server-id-deploy setup-jfrog-cli-server --repo-resolve solo-npm-release --repo-deploy solo-npm-release
echo "::group::JFrog NPM Repository Configuration"
cat .jfrog/projects/npm.yaml
echo "::endgroup::"
- name: Install Semantic Release
run: |
npm install -g semantic-release@21.0.7 @semantic-release/git@10.0.1 @semantic-release/exec@6.0.3 gradle-semantic-release-plugin@1.7.6
npm install -g conventional-changelog-conventionalcommits@6.1.0 @commitlint/cli@17.6.6 @commitlint/config-conventional@17.6.6
npm install -g marked-mangle@1.0.1 marked-gfm-heading-id@3.0.4 semantic-release-conventional-commits@3.0.0
- name: Install Dependencies
working-directory: solo
run: jf npm ci

- name: Setup NPM Authentication
working-directory: solo
run: |
# create .npmrc file to publish solo to Github NPM registry
rm -f .npmrc || true
echo '//registry.npmjs.org/:_authToken=${NPM_TOKEN}' > ".npmrc"
echo '@hashgraph:registry=https://registry.npmjs.org/' >> ".npmrc"
- name: Publish Semantic Release
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
Expand All @@ -307,8 +275,3 @@ jobs:
GIT_COMMITTER_EMAIL: ${{ secrets.GIT_USER_EMAIL }}
if: ${{ github.event.inputs.dry-run-enabled != 'true' && !cancelled() && !failure() }}
run: npx semantic-release

- name: Deploy to JFrog Registry
working-directory: solo
if: ${{ github.event.inputs.dry-run-enabled != 'true' && !cancelled() && !failure() }}
run: jf npm publish
6 changes: 0 additions & 6 deletions .github/workflows/flow-pull-request-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,6 @@ jobs:
with:
custom-job-label: Standard

solo-tests:
name: FS Network Manager Tests
uses: ./.github/workflows/zxc-solo-tests.yaml
with:
custom-job-label: Standard

codecov:
name: CodeCov
uses: ./.github/workflows/zxc-code-analysis.yaml
Expand Down
168 changes: 0 additions & 168 deletions .github/workflows/zxc-solo-tests.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -514,8 +514,6 @@ dev/local-node/config.txt
dev/temp/.env
charts/deleteme.yaml
node_modules
solo/coverage
dev/resources/nmt/version.properties
solo/test/scripts/backup
fullstack-network-manager/test/data/tmp
*.pfx
16 changes: 1 addition & 15 deletions .releaserc
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
"preset": "conventionalcommits"
}
],
[
"@semantic-release/npm",
{
"pkgRoot": "solo"
}
],
"@semantic-release/git",
"@semantic-release/github"
],
Expand All @@ -27,21 +21,13 @@
"@semantic-release/exec",
{ "cmd": "./gradlew versionAsSpecified --scan -PnewVersion=${nextRelease.version}" }
],
[
"@semantic-release/npm",
{
"pkgRoot": "solo"
}
],
[
"@semantic-release/git",
{
"assets": [
"gradle.properties",
"charts/fullstack-deployment/Chart.yaml",
"charts/fullstack-cluster-setup/Chart.yaml",
"solo/package.json",
"solo/package-lock.json"
"charts/fullstack-cluster-setup/Chart.yaml"
]
}
]
Expand Down
6 changes: 0 additions & 6 deletions build-logic/project-plugins/src/main/kotlin/Utils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,6 @@ class Utils {
}
}

@JvmStatic
fun updateSoloVersion(project: Project, newVersion: SemVer) {
val manifestFile = File(project.rootProject.projectDir, "solo/package.json")
updateStringInFile(manifestFile, "\"version\":", " \"version\": \"${newVersion}\",")
}

@JvmStatic
fun updateHelmChartAppVersion(project: Project, newVersion: SemVer) {
updateHelmCharts(project) {chart ->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ tasks.register("versionAsSpecified") {
val newVer = SemVer.parse(verStr)
Utils.updateHelmChartVersion(project, newVer)
Utils.updateHelmChartAppVersion(project, newVer)
Utils.updateSoloVersion(project, newVer)
Utils.updateVersion(project, newVer)
}
}
Expand All @@ -73,7 +72,6 @@ tasks.register("versionAsSnapshot") {

Utils.updateHelmChartVersion(project, newVer)
Utils.updateHelmChartAppVersion(project, newVer)
Utils.updateSoloVersion(project, newVer)
Utils.updateVersion(project, newVer)
}
}
Expand Down
33 changes: 0 additions & 33 deletions solo/.eslintrc.yml

This file was deleted.

1 change: 0 additions & 1 deletion solo/.npmignore

This file was deleted.

8 changes: 0 additions & 8 deletions solo/.remarkrc.yml

This file was deleted.

0 comments on commit b22d490

Please sign in to comment.