fix filesize field transfer, remove fteqw dep
All checks were successful
Construct / build (push) Successful in 3m4s
All checks were successful
Construct / build (push) Successful in 3m4s
This commit is contained in:
parent
4fff4ff79e
commit
2db5cd3eef
4 changed files with 19 additions and 15 deletions
|
@ -13,20 +13,17 @@ jobs:
|
|||
|
||||
- name: dependencies
|
||||
run: |
|
||||
apt update
|
||||
apt install -y \
|
||||
imagemagick wget
|
||||
apt-get update
|
||||
apt-get install -y openssl
|
||||
|
||||
- name: setup env
|
||||
run: |
|
||||
echo $PRIVATE_KEY > private-key.pem
|
||||
echo $PUBLIC_KEY > public-key.pem
|
||||
echo $PRIVATE_KEY64 | base64 --decode > private-key.pem
|
||||
env:
|
||||
PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
|
||||
PUBLIC_KEY: ${{ secrets.PUBLIC_KEY }}
|
||||
PRIVATE_KEY64: ${{ secrets.PRIVATE_KEY64 }}
|
||||
|
||||
- name: construct pkglists
|
||||
run: make && rm private-key.pem public-key.pem
|
||||
run: make
|
||||
env:
|
||||
AUTH_HOST: ${{ secrets.AUTH_HOST }}
|
||||
|
||||
|
@ -34,3 +31,11 @@ jobs:
|
|||
with:
|
||||
name: pkg-lists
|
||||
path: pkgs/*.txt
|
||||
|
||||
- uses: actions/forgejo-release@v2
|
||||
with:
|
||||
url: https://code.idtech.space
|
||||
repo: "pkg/lists"
|
||||
direction: upload
|
||||
release-dir: ./pkgs
|
||||
token: ${{ secrets.TOKEN }}
|
||||
|
|
9
Makefile
9
Makefile
|
@ -1,17 +1,16 @@
|
|||
|
||||
ENGINE_URL=https://code.idtech.space/fte/fteqw
|
||||
ENGINE_CLBUILD=m-dbg
|
||||
|
||||
all: list
|
||||
|
||||
list: fteqw64
|
||||
list:
|
||||
./start.sh
|
||||
|
||||
index: fteqw64
|
||||
./index.sh
|
||||
|
||||
fteqw64:
|
||||
if [ ! -d ThirdParty/fteqw ];then mkdir -p ThirdParty; git clone --depth 1 $(ENGINE_URL) ThirdParty/fteqw;else cd ./ThirdParty/fteqw && git pull;fi
|
||||
cd ThirdParty/fteqw/engine && $(MAKE) makelibs ARCH=x86_64
|
||||
cd ThirdParty/fteqw/engine && $(MAKE) $(ENGINE_CLBUILD) ARCH=x86_64
|
||||
install -m 0777 ./ThirdParty/fteqw/engine/debug/fteqw ./fteqw64
|
||||
|
||||
index:
|
||||
./index.sh
|
||||
|
|
|
@ -171,7 +171,7 @@ fi
|
|||
|
||||
if [ -f "index/$PKGNAME/size" ]
|
||||
then
|
||||
SIZE="$(head -n 1 index/$PKGNAME/size)"
|
||||
FILESIZE="$(head -n 1 index/$PKGNAME/size)"
|
||||
else
|
||||
echo "skipping due to missing index/$PKGNAME/size"
|
||||
exit 1
|
||||
|
|
2
start.sh
2
start.sh
|
@ -25,7 +25,7 @@ do
|
|||
OUTPUT="$(basename "$PKGLIST")"
|
||||
echo "version 2" > tmplist0
|
||||
cat "$PKGLIST" >> tmplist0
|
||||
SIG=$(./fteqw64 -privkey ./private-key.pem -pubkey ./public-key.pem -certhost $AUTH_HOST -sign2 tmplist0)
|
||||
SIG=$(openssl dgst -sha512 -sign ./private-key.pem tmplist0 | openssl enc -A -base64)
|
||||
head -n 1 tmplist0 > "$OUTPUT"
|
||||
echo "signature \"$AUTH_HOST\" \"$SIG\"" >> "$OUTPUT"
|
||||
tail -n +2 tmplist0 >> "$OUTPUT"
|
||||
|
|
Loading…
Reference in a new issue