CI: Update v2 branch CI to be on par with v3 (#286)
* ci: Update CI to be on par with v3 * ci: Update gosop branch for GopenPGP-v2
This commit is contained in:
parent
2a07a34fb8
commit
4e8fad59d6
9 changed files with 54 additions and 47 deletions
6
.github/test-suite/build_gosop.sh
vendored
6
.github/test-suite/build_gosop.sh
vendored
|
|
@ -1,4 +1,6 @@
|
|||
VERSION=$(awk '/^module github.com\/ProtonMail\/gopenpgp\/v[0-9]+/ {print $NF}' gopenpgp/go.mod | awk -F'v' '{print $2}')
|
||||
|
||||
cd gosop
|
||||
echo "replace github.com/ProtonMail/gopenpgp/v2 => ../gopenpgp" >> go.mod
|
||||
go get github.com/ProtonMail/gopenpgp/v2/crypto
|
||||
echo "replace github.com/ProtonMail/gopenpgp/v${VERSION} => ../gopenpgp" >> go.mod
|
||||
go get github.com/ProtonMail/gopenpgp/v${VERSION}/crypto
|
||||
go build .
|
||||
|
|
|
|||
8
.github/test-suite/config.json.template
vendored
8
.github/test-suite/config.json.template
vendored
|
|
@ -5,8 +5,8 @@
|
|||
"path": "__GOSOP_BRANCH__"
|
||||
},
|
||||
{
|
||||
"id": "gosop-main",
|
||||
"path": "__GOSOP_MAIN__"
|
||||
"id": "gosop-target",
|
||||
"path": "__GOSOP_TARGET__"
|
||||
},
|
||||
{
|
||||
"path": "__SQOP__"
|
||||
|
|
@ -17,10 +17,6 @@
|
|||
{
|
||||
"path": "__SOP_OPENPGPJS__"
|
||||
},
|
||||
{
|
||||
"id": "gosop-v2",
|
||||
"path": "__GOSOP_V2__"
|
||||
},
|
||||
{
|
||||
"path": "__RNP_SOP__"
|
||||
}
|
||||
|
|
|
|||
7
.github/test-suite/determine_gosop_branch.sh
vendored
Executable file
7
.github/test-suite/determine_gosop_branch.sh
vendored
Executable file
|
|
@ -0,0 +1,7 @@
|
|||
VERSION=$(awk '/^module github.com\/ProtonMail\/gopenpgp\/v[0-9]+/ {print $NF}' gopenpgp/go.mod | awk -F'v' '{print $2}')
|
||||
|
||||
if [ "$VERSION" -eq 3 ]; then
|
||||
echo "gosop-gopenpgp-v3"
|
||||
else
|
||||
echo "gosop-gopenpgp-v2"
|
||||
fi
|
||||
7
.github/test-suite/prepare_config.sh
vendored
7
.github/test-suite/prepare_config.sh
vendored
|
|
@ -1,13 +1,12 @@
|
|||
CONFIG_TEMPLATE=$1
|
||||
CONFIG_OUTPUT=$2
|
||||
GOSOP_BRANCH=$3
|
||||
GOSOP_MAIN=$4
|
||||
GOSOP_TARGET=$4
|
||||
cat $CONFIG_TEMPLATE \
|
||||
| sed "s@__GOSOP_BRANCH__@${GOSOP_BRANCH}@g" \
|
||||
| sed "s@__GOSOP_MAIN__@${GOSOP_MAIN}@g" \
|
||||
| sed "s@__GOSOP_TARGET__@${GOSOP_TARGET}@g" \
|
||||
| sed "s@__SQOP__@${SQOP}@g" \
|
||||
| sed "s@__GPGME_SOP__@${GPGME_SOP}@g" \
|
||||
| sed "s@__SOP_OPENPGPJS__@${SOP_OPENPGPJS}@g" \
|
||||
| sed "s@__GOSOP_V2__@${GOSOP_DIR_V2}/gosop@g" \
|
||||
| sed "s@__SOP_OPENPGPJS__@${SOP_OPENPGPJS_V2}@g" \
|
||||
| sed "s@__RNP_SOP__@${RNP_SOP}@g" \
|
||||
> $CONFIG_OUTPUT
|
||||
Loading…
Add table
Add a link
Reference in a new issue