Skip to content

Commit 8073643

Browse files
authored
Merge pull request #242 from KiraCore/feature/ci-cd-v2
feature/ci-cd-v2 -> release/v0.3.38
2 parents 3a9bd44 + 06fbe02 commit 8073643

File tree

7 files changed

+197
-107
lines changed

7 files changed

+197
-107
lines changed

.github/workflows/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
- name: Print debug data before build
6363
run: |
6464
set -x
65-
echo "Bash Utils version: $(bash-utils bashUtilsVersion)"
65+
echo "Bash Utils version: $(bu bashUtilsVersion)"
6666
echo " Source branch: ${{ env.SOURCE_BRANCH }}"
6767
echo "Destination branch: ${{ env.DESTINATION_BRANCH }}"
6868
echo " Event name: ${{ github.event_name }}"
@@ -225,11 +225,11 @@ jobs:
225225
id-token: write
226226
pull-requests: write
227227
steps:
228-
# ref.: https://github.com/sigstore/cosign-installer, v2.2.0
228+
# ref.: https://github.com/sigstore/cosign-installer, v3.0.1
229229
- name: Install cosign
230-
uses: sigstore/cosign-installer@d6a3abf1bdea83574e28d40543793018b6035605
230+
uses: sigstore/cosign-installer@c3667d99424e7e6047999fb6246c0da843953c65
231231
with:
232-
cosign-release: 'v1.7.2'
232+
cosign-release: 'v2.0.0'
233233
- name: Download AMD64 artifacts
234234
# ref.: https://github.com/actions/download-artifact, v3.0.0
235235
uses: actions/download-artifact@fb598a63ae348fa914e94cd0ff38f362e927b741
@@ -298,7 +298,7 @@ jobs:
298298
COSIGN_PASSWORD: ${{ secrets.COSIGN_PASSWORD }}
299299
run: |
300300
echo "$KEY" > ../cosign.key
301-
for FILE in *; do FILE_NAME=$(basename $FILE); cosign sign-blob --key=../cosign.key --output-signature=./${FILE_NAME}.sig ./$FILE_NAME; done
301+
for FILE in *; do FILE_NAME=$(basename $FILE); cosign sign-blob --key=../cosign.key --output-signature=./${FILE_NAME}.sig ./$FILE_NAME --yes; done
302302
rm -fv ../cosign.key
303303
# ref: https://github.com/softprops/action-gh-release, v0.1.14
304304
# Release on merge only (push action) - this should run only once

README.md

Lines changed: 25 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@ Cosign requires simple initial setup of the signer keys described more precisely
99

1010
```bash
1111
# install cosign
12-
COSIGN_VERSION="v1.13.1" && \
12+
COSIGN_VERSION="v2.0.0" && \
1313
if [[ "$(uname -m)" == *"ar"* ]] ; then ARCH="arm64"; else ARCH="amd64" ; fi && echo $ARCH && \
1414
PLATFORM=$(uname) && FILE=$(echo "cosign-${PLATFORM}-${ARCH}" | tr '[:upper:]' '[:lower:]') && \
1515
wget https://github.com/sigstore/cosign/releases/download/${COSIGN_VERSION}/$FILE && chmod +x -v ./$FILE && \
1616
mv -fv ./$FILE /usr/local/bin/cosign && cosign version
1717

1818
# save KIRA public cosign key
19-
cat > ./cosign.pub << EOL
19+
KIRA_COSIGN_PUB=/usr/keys/kira-cosign.pub && mkdir -p $KIRA_COSIGN_PUB && \
20+
cat > ./cosign.pub << EOL
2021
-----BEGIN PUBLIC KEY-----
2122
MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE/IrzBQYeMwvKa44/DF/HB7XDpnE+
2223
f+mU9F/Qbfq25bBWV2+NlYMJv3KvKHNtu3Jknt6yizZjUV4b8WGfKBzFYw==
@@ -26,21 +27,37 @@ EOL
2627
# download desired files and the corresponding .sig file from: https://github.com/KiraCore/tools/releases
2728

2829
# verify signature of downloaded files
29-
cosign verify-blob --key=./cosign.pub --signature=./<file>.sig ./<file>
30+
# NOTE: You might need insecure-ignore-tlog and/or insecure-ignore-sct if you verify old signatures from before v2.0.0
31+
cosign verify-blob --key=./cosign.pub --signature=./<file>.sig ./<file> --insecure-ignore-tlog --insecure-ignore-sct
3032
```
3133

3234
## bash-utils
3335

34-
KIRA bash-utils is a general purpose tool for simplifying scripts & commands
36+
KIRA bash-utils (BU) is a general purpose tool for simplifying scripts & commands
3537

3638
```bash
3739
# one line install
38-
TOOLS_VERSION="v0.3.4" && mkdir -p /usr/keys && FILE_NAME="bash-utils.sh" && \
39-
if [ -z "$KIRA_COSIGN_PUB" ] ; then KIRA_COSIGN_PUB=/usr/keys/kira-cosign.pub ; fi && \
40-
echo -e "-----BEGIN PUBLIC KEY-----\nMFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE/IrzBQYeMwvKa44/DF/HB7XDpnE+\nf+mU9F/Qbfq25bBWV2+NlYMJv3KvKHNtu3Jknt6yizZjUV4b8WGfKBzFYw==\n-----END PUBLIC KEY-----" > $KIRA_COSIGN_PUB && \
40+
TOOLS_VERSION="v0.3.36" && cd /tmp && FILE_NAME="bash-utils.sh" && \
4141
wget "https://github.com/KiraCore/tools/releases/download/$TOOLS_VERSION/${FILE_NAME}" -O ./$FILE_NAME && \
4242
wget "https://github.com/KiraCore/tools/releases/download/$TOOLS_VERSION/${FILE_NAME}.sig" -O ./${FILE_NAME}.sig && \
43-
cosign verify-blob --key="$KIRA_COSIGN_PUB" --signature=./${FILE_NAME}.sig ./$FILE_NAME && \
43+
cosign verify-blob --key="$KIRA_COSIGN_PUB" --signature=./${FILE_NAME}.sig ./$FILE_NAME --insecure-ignore-tlog && \
4444
chmod -v 555 ./$FILE_NAME && ./$FILE_NAME bashUtilsSetup "/var/kiraglob" && . /etc/profile && \
4545
echoInfo "Installed bash-utils $(bashUtilsVersion)"
4646
```
47+
48+
## bip39gen
49+
50+
A simple and secure bip39 words generator that is able to mix computer and human provided entropy
51+
52+
```bash
53+
# once BU is installed, you can easily and securely install all tools for a relevant architecture and platform
54+
# one line install with verification of IPFS CID referencing a public key used to sign the release
55+
TOOLS_VERSION="v0.3.36" && TOOL_NAME="bip39gen" && cd /tmp && \
56+
bu safeWget ./${TOOL_NAME}.deb "https://github.com/KiraCore/tools/releases/download/$TOOLS_VERSION/${TOOL_NAME}-$(getPlatform)-$(getArch).deb" \
57+
"QmeqFDLGfwoWgCy2ZEFXerVC5XW8c5xgRyhK5bLArBr2ue" && rm -rfv ./$TOOL_NAME&& dpkg-deb -x ./${TOOL_NAME}.deb ./$TOOL_NAME && \
58+
cp -fv ./$TOOL_NAME/bin/$TOOL_NAME /usr/local/bin/$TOOL_NAME && chmod +x "/usr/local/bin/$TOOL_NAME" && \
59+
rm -rfv ./$TOOL_NAME ./${TOOL_NAME}.deb
60+
61+
# Check bip39gen version
62+
bip39gen version
63+
```

RELEASE.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
11
Features:
2-
* validator-key-gen: add --version flag
2+
3+
* added cursor flag to the pressToContinue command
4+
* speedup args parsing
5+
* updated cosign to v2.0.0

0 commit comments

Comments
 (0)