Skip to content

Commit 10c3e8d

Browse files
deepu105deepu105
committed
ci/cd updates
1 parent c29d65d commit 10c3e8d

File tree

11 files changed

+49
-161
lines changed

11 files changed

+49
-161
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ If applicable, add screenshots to help explain your problem.
2727
- OS and OS version: [e.g. macOS 10.1 / Fedora 34 / WIndows 10]
2828
- Terminal name and version [e.g. Tilix, Yakuake, Gnome Terminal, Konsole, iTerm, Windows CMD]
2929
- Shell name and version [e.g. bash, zsh, fish, powershell]
30-
- Kubectl Client Version [e.g. 1.19]
31-
- Kubectl Server Version [e.g. 1.19]
3230
- jwt-ui version [e.g. 0.0.8]
3331

3432
**Additional context**

‎.github/workflows/cd.yml

Lines changed: 14 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ jobs:
5151
- { os: "windows-latest", target: "x86_64-pc-windows-msvc", artifact_prefix: "windows" }
5252
- { os: "ubuntu-latest", target: "x86_64-unknown-linux-gnu", artifact_prefix: "linux", }
5353
- { os: "ubuntu-latest", target: "x86_64-unknown-linux-musl", artifact_prefix: "linux-musl", }
54-
- { os: "ubuntu-latest", target: "aarch64-unknown-linux-gnu", artifact_prefix: "aarch64-gnu", use-cross: true, test-bin: "--bin jwt-ui" }
55-
- { os: "ubuntu-latest", target: "aarch64-unknown-linux-musl", artifact_prefix: "aarch64-musl", use-cross: true, test-bin: "--bin jwt-ui" }
56-
- { os: "ubuntu-latest", target: "arm-unknown-linux-gnueabihf", artifact_prefix: "arm-gnu", use-cross: true, test-bin: "--bin jwt-ui" }
57-
- { os: "ubuntu-latest", target: "arm-unknown-linux-musleabihf", artifact_prefix: "arm-musl", use-cross: true, test-bin: "--bin jwt-ui" }
54+
- { os: "ubuntu-latest", target: "aarch64-unknown-linux-gnu", artifact_prefix: "aarch64-gnu", use-cross: true, test-bin: "--bin jwtui" }
55+
- { os: "ubuntu-latest", target: "aarch64-unknown-linux-musl", artifact_prefix: "aarch64-musl", use-cross: true, test-bin: "--bin jwtui" }
56+
- { os: "ubuntu-latest", target: "arm-unknown-linux-gnueabihf", artifact_prefix: "arm-gnu", use-cross: true, test-bin: "--bin jwtui" }
57+
- { os: "ubuntu-latest", target: "arm-unknown-linux-musleabihf", artifact_prefix: "arm-musl", use-cross: true, test-bin: "--bin jwtui" }
5858

5959
steps:
6060
- name: Checkout repository
@@ -121,10 +121,10 @@ jobs:
121121
shell: bash
122122
run: |
123123
cd target/${{ matrix.job.target }}/release
124-
BINARY_NAME=jwt-ui.exe
124+
BINARY_NAME=jwtui.exe
125125
# strip the binary
126126
strip $BINARY_NAME
127-
RELEASE_NAME=jwt-ui-${{ matrix.job.artifact_prefix }}
127+
RELEASE_NAME=jwtui-${{ matrix.job.artifact_prefix }}
128128
tar czvf $RELEASE_NAME.tar.gz $BINARY_NAME
129129
# create sha checksum files
130130
certutil -hashfile $RELEASE_NAME.tar.gz sha256 | grep -E [A-Fa-f0-9]{64} > $RELEASE_NAME.sha256
@@ -141,10 +141,10 @@ jobs:
141141
aarch64-*-linux-*) STRIP="aarch64-linux-gnu-strip" ;;
142142
esac;
143143
cd target/${{ matrix.job.target }}/release
144-
BINARY_NAME=jwt-ui
144+
BINARY_NAME=jwtui
145145
# strip the binary
146146
"$STRIP" "$BINARY_NAME"
147-
RELEASE_NAME=jwt-ui-${{ matrix.job.artifact_prefix }}
147+
RELEASE_NAME=jwtui-${{ matrix.job.artifact_prefix }}
148148
tar czvf $RELEASE_NAME.tar.gz $BINARY_NAME
149149
# create sha checksum files
150150
shasum -a 256 $RELEASE_NAME.tar.gz > $RELEASE_NAME.sha256
@@ -171,7 +171,7 @@ jobs:
171171

172172
publish-package-formula:
173173
needs: [build-release]
174-
name: Update homebrew & choco formulas
174+
name: Update homebrew & scoop formulas
175175
runs-on: ubuntu-latest
176176
steps:
177177
- name: Checkout repository
@@ -188,11 +188,11 @@ jobs:
188188
- name: Set release assets and version
189189
shell: bash
190190
run: |
191-
macos_sha="$(cat ./artifacts/jwt-ui-macos.sha256 | awk '{print $1}')"
191+
macos_sha="$(cat ./artifacts/jwtui-macos.sha256 | awk '{print $1}')"
192192
echo "MACOS_SHA=$macos_sha" >> $GITHUB_ENV
193-
linux_sha="$(cat ./artifacts/jwt-ui-linux.sha256 | awk '{print $1}')"
193+
linux_sha="$(cat ./artifacts/jwtui-linux.sha256 | awk '{print $1}')"
194194
echo "LINUX_SHA=$linux_sha" >> $GITHUB_ENV
195-
windows_sha="$(cat ./artifacts/jwt-ui-windows.sha256 | awk '{print $1}')"
195+
windows_sha="$(cat ./artifacts/jwtui-windows.sha256 | awk '{print $1}')"
196196
echo "WINDOWS_SHA=$windows_sha" >> $GITHUB_ENV
197197
release_version="$(cat ./artifacts/release-version)"
198198
echo "RELEASE_VERSION=$release_version" >> $GITHUB_ENV
@@ -212,33 +212,14 @@ jobs:
212212
# push to Git
213213
git config --global user.email "[email protected]"
214214
git config --global user.name "deepu105"
215-
git clone https://deepu105:${{ secrets.TAP_GITHUB_TOKEN }}@github.com/jwt-rs/homebrew-jwt-ui.git --branch=main brew
215+
git clone https://deepu105:${{ secrets.BREWTAP_GITHUB_TOKEN }}@github.com/jwt-rs/homebrew-jwt-ui.git --branch=main brew
216216
rm brew/Formula/jwt-ui.rb
217217
cp jwt-ui.rb brew/Formula
218218
cd brew
219219
git add .
220220
git diff-index --quiet HEAD || git commit -am "Update formula for jwt-ui release ${{ env.RELEASE_VERSION }}"
221221
git push origin main
222222
223-
- name: Execute chocolatey packaging script
224-
run: |
225-
# run packaging script
226-
python "./deployment/chocolatey/packager.py" ${{ env.RELEASE_VERSION }} "./deployment/chocolatey/jwt-ui.nuspec.template" "./jwt-ui.nuspec" ${{ env.WINDOWS_SHA }}
227-
python "./deployment/chocolatey/packager.py" ${{ env.RELEASE_VERSION }} "./deployment/chocolatey/chocolateyinstall.ps1.template" "./chocolateyinstall.ps1" ${{ env.WINDOWS_SHA }}
228-
229-
# push to Git
230-
git config --global user.email "[email protected]"
231-
git config --global user.name "deepu105"
232-
git clone https://deepu105:${{ secrets.CHOCO_GITHUB_TOKEN }}@github.com/jwt-rs/choco-jwt-ui --branch=main choco
233-
rm choco/jwt-ui.nuspec
234-
rm choco/tools/chocolateyinstall.ps1
235-
cp jwt-ui.nuspec choco/jwt-ui.nuspec
236-
cp chocolateyinstall.ps1 choco/tools/chocolateyinstall.ps1
237-
cd choco
238-
git add .
239-
git diff-index --quiet HEAD || git commit -am "Update package for jwt-ui release ${{ env.RELEASE_VERSION }}"
240-
git push origin main
241-
242223
- name: Execute Scoop packaging script
243224
run: |
244225
# run packaging script
@@ -247,7 +228,7 @@ jobs:
247228
# push to Git
248229
git config --global user.email "[email protected]"
249230
git config --global user.name "deepu105"
250-
git clone https://deepu105:${{ secrets.CHOCO_GITHUB_TOKEN }}@github.com/jwt-rs/scoop-jwt-ui --branch=main scoop
231+
git clone https://deepu105:${{ secrets.SCOOP_GITHUB_TOKEN }}@github.com/jwt-rs/scoop-jwt-ui --branch=main scoop
251232
rm scoop/jwt-ui.json
252233
cp jwt-ui.json scoop/jwt-ui.json
253234
cd scoop

‎.vscode/launch.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,26 @@
55
"version": "0.2.0",
66
"configurations": [
77
{
8-
"name": "Windows - Debug executable 'jwt-ui'",
8+
"name": "Windows - Debug executable 'jwtui'",
99
"type": "lldb",
1010
"request": "launch",
11-
"program": "${workspaceFolder}\\target\\debug\\jwt-ui.exe",
11+
"program": "${workspaceFolder}\\target\\debug\\jwtui.exe",
1212
"args": [],
1313
"sourceLanguages": [ "rust" ],
1414
"cwd": "${workspaceFolder}"
1515
},
1616
{
1717
"type": "lldb",
1818
"request": "launch",
19-
"name": "Debug executable 'jwt-ui'",
19+
"name": "Debug executable 'jwtui'",
2020
"cargo": {
2121
"args": [
2222
"build",
23-
"--bin=jwt-ui",
24-
"--package=jwt-ui"
23+
"--bin=jwtui",
24+
"--package=jwtui"
2525
],
2626
"filter": {
27-
"name": "jwt-ui",
27+
"name": "jwtui",
2828
"kind": "bin"
2929
}
3030
},
@@ -34,16 +34,16 @@
3434
{
3535
"type": "lldb",
3636
"request": "launch",
37-
"name": "Debug unit tests in executable 'jwt-ui'",
37+
"name": "Debug unit tests in executable 'jwtui'",
3838
"cargo": {
3939
"args": [
4040
"test",
4141
"--no-run",
42-
"--bin=jwt-ui",
43-
"--package=jwt-ui"
42+
"--bin=jwtui",
43+
"--package=jwtui"
4444
],
4545
"filter": {
46-
"name": "jwt-ui",
46+
"name": "jwtui",
4747
"kind": "bin"
4848
}
4949
},

‎LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2021 Deepu K Sasidharan
3+
Copyright (c) 2024 Deepu K Sasidharan
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,15 @@
1212

1313
[![Follow Deepu K Sasidharan (deepu105)](https://img.shields.io/twitter/follow/deepu105?label=Follow%20Deepu%20K%20Sasidharan%20%28deepu105%29&style=social)](https://twitter.com/intent/follow?screen_name=deepu105)
1414

15+
```
16+
____.__ _____________ ____ ___.___
17+
| / \ / \__ ___/ | | \ |
18+
| \ \/\/ / | | ______ | | / |
19+
/\__| |\ / | | /_____/ | | /| |
20+
\________| \__/\ / |____| |______/ |___|
21+
\/
22+
```
23+
1524
A terminal UI for decoding/encoding JSON Web Tokens inspired by [JWT.io](https://jwt.io/) and [jwt-cli](https://github.com/mike-engel/jwt-cli)
1625

1726
![UI](screenshots/decoder.png)
@@ -107,7 +116,7 @@ Options:
107116

108117
## Features
109118

110-
- Fully offline
119+
- Fully offline
111120
- Dark/Light themes
112121
- Sensible keyboard shortcuts
113122

‎deployment/chocolatey/chocolateyinstall.ps1.template

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎deployment/chocolatey/kdash.nuspec.template

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎deployment/chocolatey/packager.py

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎deployment/getLatest.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# The install script is licensed under the CC-0 1.0 license.
3+
# The install script is licensed under the MIT license.
44

55
# See https://github.com/jwt-rs/jwt-ui/blob/main/LICENSE for more details.
66
#
@@ -9,7 +9,7 @@
99

1010
GITHUB_REPO="jwt-ui"
1111
GITHUB_USER="jwt-rs"
12-
EXE_FILENAME="jwt-ui"
12+
EXE_FILENAME="jwtui"
1313
EXE_DEST_DIR="/usr/local/bin"
1414

1515
bye() {

‎deployment/homebrew/kdash.rb.template renamed to ‎deployment/homebrew/jwt-ui.rb.template

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11

22
# Documentation: https://docs.brew.sh/Formula-Cookbook
33
# https://rubydoc.brew.sh/Formula
4-
class jwt-ui < Formula
5-
desc "A fast and simple dashboard for Kubernetes written in Rust"
4+
class JwtUi < Formula
5+
desc "A Terminal UI for decoding/encoding JSON Web Tokens"
66
homepage "https://github.com/jwt-rs/jwt-ui"
77
if OS.mac?
8-
url "https://github.com/jwt-rs/jwt-ui/releases/download/$version/jwt-ui-macos.tar.gz"
8+
url "https://github.com/jwt-rs/jwt-ui/releases/download/$version/jwtui-macos.tar.gz"
99
sha256 "$hash_mac"
1010
else
11-
url "https://github.com/jwt-rs/jwt-ui/releases/download/$version/jwt-ui-linux.tar.gz"
11+
url "https://github.com/jwt-rs/jwt-ui/releases/download/$version/jwtui-linux.tar.gz"
1212
sha256 "$hash_linux"
1313
end
1414
version "$version"
1515
license "MIT"
1616

1717
def install
18-
bin.install "jwt-ui"
19-
ohai "You're done! Run with \"jwt-ui\""
20-
ohai "For runtime flags, see \"jwt-ui --help\""
18+
bin.install "jwtui"
19+
ohai "You're done! Run with \"jwtui\""
20+
ohai "For runtime flags, see \"jwtui --help\""
2121
end
2222
end

0 commit comments

Comments
 (0)