From d344c4dfe1430ecef19865450e977a6e899135f1 Mon Sep 17 00:00:00 2001 From: Jonatan Nilsson Date: Sun, 5 Nov 2023 04:11:48 +0000 Subject: [PATCH] Final commit --- .../{discord_embed.yaml.disable => discord_embed.yaml} | 8 +++----- .gitea/workflows/nfp_moe.yaml | 2 -- .gitea/workflows/{saproxy.yaml.disable => saproxy.yaml} | 8 +++----- 3 files changed, 6 insertions(+), 12 deletions(-) rename .gitea/workflows/{discord_embed.yaml.disable => discord_embed.yaml} (88%) rename .gitea/workflows/{saproxy.yaml.disable => saproxy.yaml} (88%) diff --git a/.gitea/workflows/discord_embed.yaml.disable b/.gitea/workflows/discord_embed.yaml similarity index 88% rename from .gitea/workflows/discord_embed.yaml.disable rename to .gitea/workflows/discord_embed.yaml index 70bd027..cffe017 100644 --- a/.gitea/workflows/discord_embed.yaml.disable +++ b/.gitea/workflows/discord_embed.yaml @@ -15,12 +15,12 @@ jobs: CURR_NAME="$(cat package.json | jq -r .name) v$(cat package.json | jq -r .version)" echo "Checking https://git.nfp.is/api/v1/repos/${{ gitea.repository }}/releases for name ${CURR_NAME}" - curl -s -X GET -H "Authorization: token ${{ secrets.deploytoken }}" https://git.nfp.is/api/v1/repos/${{ gitea.repository }}/releases | grep -o "\"name\"\:\"${CURR_NAME}\"" > /dev/null || curlexit=$? - if [ $curlexit -eq 0 ] ; then + if curl -s -X GET -H "Authorization: token ${{ secrets.deploytoken }}" https://git.nfp.is/api/v1/repos/${{ gitea.repository }}/releases | grep -o "\"name\"\:\"${CURR_NAME}\"" > /dev/null; then echo "Skipping ${{ gitea.job }} since $CURR_NAME already exists"; - exit 0; + exit 0 fi + echo "New release ${CURR_VER} found, running npm install..." mv package.json fuck-you-npm-package.json @@ -33,8 +33,6 @@ jobs: chmod +x ../7zas ../7zas a -xr!*.xcf -mx9 "${CURR_VER}_build-sc.7z" package.json index.mjs api base public - exit 0 - echo "Creating ${CURR_VER} release on gitea" RELEASE_RESULT=$(curl \ -X POST \ diff --git a/.gitea/workflows/nfp_moe.yaml b/.gitea/workflows/nfp_moe.yaml index d700c60..cffe017 100644 --- a/.gitea/workflows/nfp_moe.yaml +++ b/.gitea/workflows/nfp_moe.yaml @@ -33,8 +33,6 @@ jobs: chmod +x ../7zas ../7zas a -xr!*.xcf -mx9 "${CURR_VER}_build-sc.7z" package.json index.mjs api base public - exit 0 - echo "Creating ${CURR_VER} release on gitea" RELEASE_RESULT=$(curl \ -X POST \ diff --git a/.gitea/workflows/saproxy.yaml.disable b/.gitea/workflows/saproxy.yaml similarity index 88% rename from .gitea/workflows/saproxy.yaml.disable rename to .gitea/workflows/saproxy.yaml index 70bd027..cffe017 100644 --- a/.gitea/workflows/saproxy.yaml.disable +++ b/.gitea/workflows/saproxy.yaml @@ -15,12 +15,12 @@ jobs: CURR_NAME="$(cat package.json | jq -r .name) v$(cat package.json | jq -r .version)" echo "Checking https://git.nfp.is/api/v1/repos/${{ gitea.repository }}/releases for name ${CURR_NAME}" - curl -s -X GET -H "Authorization: token ${{ secrets.deploytoken }}" https://git.nfp.is/api/v1/repos/${{ gitea.repository }}/releases | grep -o "\"name\"\:\"${CURR_NAME}\"" > /dev/null || curlexit=$? - if [ $curlexit -eq 0 ] ; then + if curl -s -X GET -H "Authorization: token ${{ secrets.deploytoken }}" https://git.nfp.is/api/v1/repos/${{ gitea.repository }}/releases | grep -o "\"name\"\:\"${CURR_NAME}\"" > /dev/null; then echo "Skipping ${{ gitea.job }} since $CURR_NAME already exists"; - exit 0; + exit 0 fi + echo "New release ${CURR_VER} found, running npm install..." mv package.json fuck-you-npm-package.json @@ -33,8 +33,6 @@ jobs: chmod +x ../7zas ../7zas a -xr!*.xcf -mx9 "${CURR_VER}_build-sc.7z" package.json index.mjs api base public - exit 0 - echo "Creating ${CURR_VER} release on gitea" RELEASE_RESULT=$(curl \ -X POST \