Skip to content
This repository was archived by the owner on Sep 9, 2022. It is now read-only.

Commit 241f814

Browse files
committed
update: rename core to scc, update tasks, and update configs
1 parent 7abf31a commit 241f814

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+50
-25
lines changed

.devcontainer/devcontainer.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,6 @@
3434
"golang.go",
3535
"bbenoist.Nix"
3636
],
37-
"postCreateCommand": "go mod tidy && cd core && yarn",
37+
"postCreateCommand": "go mod tidy && cd scc && yarn",
3838
"remoteUser": "userx"
3939
}

.github/dependabot.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,13 @@ updates:
88
reviewers:
99
- abdfnx
1010
- package-ecosystem: npm
11-
directory: "/core"
11+
directory: "/scc"
12+
schedule:
13+
interval: "daily"
14+
reviewers:
15+
- abdfnx
16+
- package-ecosystem: npm
17+
directory: "/hub"
1218
schedule:
1319
interval: "daily"
1420
reviewers:

.github/workflows/build-ci.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ jobs:
5151

5252
- name: Building From Source
5353
run: |
54-
task build-core
55-
task link-core
54+
task build-scc
55+
task link-scc
5656
.\scripts\bfs.ps1
5757
echo "::add-path::C:\Users\runneradmin\AppData\Local\secman\bin\;"
5858

.github/workflows/release.yml

+12-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Release
33
on:
44
push:
55
tags:
6-
- '*'
6+
- "*"
77

88
env:
99
GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
@@ -30,17 +30,24 @@ jobs:
3030
with:
3131
node-version: 16
3232

33-
- name: Set up Tag
34-
id: ghtag
35-
run: echo ::set-output name=tag::${GITHUB_REF#refs/*/}
33+
- name: Set up `Task`
34+
uses: arduino/setup-task@v1
3635

3736
- name: Set up GoReleaser
3837
uses: goreleaser/goreleaser-action@v2
3938
with:
4039
install-only: true
4140

4241
- name: Set up Date
43-
run: go run ./scripts/date.go >> date.txt
42+
run: task set-tag-and-date
4443

4544
- name: Build
4645
run: BuildDate="$(cat date.txt)" goreleaser release --rm-dist --timeout 100m
46+
47+
- name: Build SMUI
48+
run: task build-smui
49+
50+
- name: Upload SMUI
51+
uses: softprops/action-gh-release@v1
52+
with:
53+
files: smui.zip

.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ vendor
4848
# Builds, Secman CLI Core Lib, Cache and Tmp
4949
.cache
5050
dist
51-
core/lib
51+
scc/lib
5252
tmp
5353

5454
# Other

README.md

+1-1

Taskfile.yaml

+17-8
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,28 @@ tasks:
3232
- go mod tidy -compat=1.18
3333
- go build -ldflags "-X main.version=$(cat tag.txt) -X main.buildDate=$(cat date.txt)" -o secman
3434

35-
build-core:
36-
dir: ./core
35+
build-scc:
36+
dir: ./scc
3737
cmds:
3838
- if ! [ -d ./node_modules ]; then yarn; fi
3939
- yarn build
4040

41-
link-core:
42-
dir: ./core
41+
build-smui:
42+
dir: ./hub
43+
cmds:
44+
- task: set-tag-and-date
45+
- yarn build
46+
- mv dist ui
47+
- cp tag.txt ui
48+
- zip -9 -r smui.zip ui
49+
50+
link-scc:
51+
dir: ./scc
4352
cmds:
4453
- npm link
4554

46-
publish-core:
47-
dir: ./core
55+
publish-scc:
56+
dir: ./scc
4857
cmds:
4958
- yarn publish
5059

@@ -56,6 +65,6 @@ tasks:
5665
desc: build from source
5766
cmds:
5867
- task: build
59-
- task: build-core
60-
- task: link-core
68+
- task: build-scc
69+
- task: link-scc
6170
- task: install

crypto/README.md

+3

crypto/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@secman/crypto",
3-
"version": "0.0.1",
4-
"description": "Secman Crypto",
3+
"version": "0.0.2",
4+
"description": "A library for encrypting and decrypting data using in Secman products.",
55
"main": "./main.ts",
66
"types": "./main.ts",
77
"license": "MIT",

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,15 @@
1616
"secrets"
1717
],
1818
"workspaces": [
19-
"core",
20-
"hub",
2119
"crypto",
20+
"hub",
21+
"scc",
2222
"tools/spinner"
2323
],
2424
"scripts": {
2525
"dev": "turbo run dev --parallel",
2626
"build": "turbo run build",
27-
"clean": "rimraf node_modules && cd core && rimraf node_modules && cd ../hub && rimraf node_modules && cd ../crypto && rimraf node_modules && cd ../tools/spinner && rimraf node_modules && cd ../.."
27+
"clean": "rimraf node_modules && cd scc && rimraf node_modules && cd ../hub && rimraf node_modules && cd ../crypto && rimraf node_modules && cd ../tools/spinner && rimraf node_modules && cd ../.."
2828
},
2929
"author": {
3030
"name": "Secman, Inc.",

core/README.md scc/README.md

core/bin/run scc/bin/run

File renamed without changes.

core/bin/run.cmd scc/bin/run.cmd

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

core/package.json scc/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@secman/scc",
33
"description": "The command-line interface of Secman Core.",
4-
"version": "0.1.1",
4+
"version": "0.1.2",
55
"main": "lib/index.js",
66
"license": "MIT",
77
"homepage": "https://secman.dev",
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

core/src/help.ts scc/src/help.ts

File renamed without changes.
File renamed without changes.

core/src/index.ts scc/src/index.ts

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)