From fd0372737397770afc92965f0ad4b61cccf550da Mon Sep 17 00:00:00 2001 From: nr0q Date: Sun, 22 Oct 2023 13:42:33 -0500 Subject: [PATCH] trying agnostic "Platform" and "Sdk" --- .gitlab-ci.yml | 8 ++++++-- flatpak_arm64_manifest.yml | 5 ++--- flatpak_x64_manifest.yml | 5 ++--- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 405358d..4111eec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -536,11 +536,15 @@ discord_notify: LINx64_MD5=($(md5sum artifacts/GridTracker-${VER}-linux-x64.tar.gz)) LINx64_STRING="**GridTracker-${VER}-linux-x64.tar.gz**\nMD5: ${LINx64_MD5}\n${BASEURL}GridTracker-${VER}-linux-x64.tar.gz\n${BASEURL}GridTracker-${VER}-linux-x86.tar.gz.asc\n\n" DEB_MD5=($(md5sum artifacts/gridtracker_${VER}_all.deb)) - DEB_STRING="**gridtracker_${VER}_all.deb**\nMD5: ${DEB_MD5} - ${BASEURL}gridtracker_${VER}_all.deb" + DEB_STRING="**gridtracker_${VER}_all.deb**\nMD5: ${DEB_MD5}\nn${BASEURL}gridtracker_${VER}_all.deb\nn" + FLPKARM64_MD5=($(md5sum artifacts/GridTracker-${VER}-arm64.flatpak)) + FLPKARM64_STRING="**GridTracker-${VER}-arm64.flatpak**\nMD5: ${FLPKARM64_MD6}\n${BASEURL}GridTracker-${VER}-arm64.flatpak\nn" + FLPKx86_MD5=($(md5sum artifacts/GridTracker-${VER}-x86_64.flatpak)) + FLPKx86_STRING="**GridTracker-${VER}-x86_64.flatpak**\nMD5: ${FLPKx86_MD6}\n${BASEURL}GridTracker-${VER}-x86_64.flatpak\nn" fi curl -H "Content-Type: application/json" -X POST $DISCORD_WEBHOOK --data-binary @- << EOM { - "content": "${CI_COMMIT_TAG_MESSAGE}\n\n${WIN_STRING}${MAC_STRING}${LINARM32_STRING}${LINARM64_STRING}${LINx86_STRING}${LINx64_STRING}${DEB_STRING}", + "content": "${CI_COMMIT_TAG_MESSAGE}\n\n${WIN_STRING}${MAC_STRING}${LINARM32_STRING}${LINARM64_STRING}${LINx86_STRING}${LINx64_STRING}${DEB_STRING}${FLPKARM64_STRING}${FLPKx86_STRING}", "tts": false, "embeds": [], "components": {}, diff --git a/flatpak_arm64_manifest.yml b/flatpak_arm64_manifest.yml index 6350ac0..33f6843 100644 --- a/flatpak_arm64_manifest.yml +++ b/flatpak_arm64_manifest.yml @@ -1,8 +1,7 @@ --- app-id: org.gridtracker.GridTracker -runtime: org.freedesktop.Platform -runtime-version: 22.08 -sdk: org.freedesktop.Sdk +runtime: Platform +sdk: Sdk rename-desktop-file: gridtracker.desktop rename-icon: gridview copy-icon: true diff --git a/flatpak_x64_manifest.yml b/flatpak_x64_manifest.yml index 6350ac0..33f6843 100644 --- a/flatpak_x64_manifest.yml +++ b/flatpak_x64_manifest.yml @@ -1,8 +1,7 @@ --- app-id: org.gridtracker.GridTracker -runtime: org.freedesktop.Platform -runtime-version: 22.08 -sdk: org.freedesktop.Sdk +runtime: Platform +sdk: Sdk rename-desktop-file: gridtracker.desktop rename-icon: gridview copy-icon: true