From 2a50e4832829ea547cebcda2b30cbade0b5a61e3 Mon Sep 17 00:00:00 2001 From: Kenny <27463495+Frontesque@users.noreply.github.com> Date: Thu, 10 Mar 2022 12:51:40 -0500 Subject: [PATCH] include app hash in app --- .github/workflows/ci.yml | 3 ++ .../{BetterTube.afdesign => VueTube.afdesign} | Bin Icons/{BetterTube.png => VueTube.png} | Bin NUXT/nuxt.config.js | 2 +- readme.md | 2 +- scripts/publish-android.sh | 37 ------------------ 6 files changed, 5 insertions(+), 39 deletions(-) rename Icons/{BetterTube.afdesign => VueTube.afdesign} (100%) rename Icons/{BetterTube.png => VueTube.png} (100%) delete mode 100644 scripts/publish-android.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4854cb8..87551e6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,6 +23,9 @@ jobs: node-version: ${{ env.NODE_VERSION }} - name: Install dependencies run: npm i; cd NUXT; npm i + - name: Set App Version + working-directory: NUXT + run: sed -i 's/dev-local/${{ github.sha }}/' nuxt.config.js - name: Build web assets working-directory: NUXT run: npm run generate diff --git a/Icons/BetterTube.afdesign b/Icons/VueTube.afdesign similarity index 100% rename from Icons/BetterTube.afdesign rename to Icons/VueTube.afdesign diff --git a/Icons/BetterTube.png b/Icons/VueTube.png similarity index 100% rename from Icons/BetterTube.png rename to Icons/VueTube.png diff --git a/NUXT/nuxt.config.js b/NUXT/nuxt.config.js index e25c2cb..e970be3 100644 --- a/NUXT/nuxt.config.js +++ b/NUXT/nuxt.config.js @@ -4,7 +4,7 @@ export default { //--- Bettertube Stuff ---// env: { - appVersion: "dev", + appVersion: "dev-local", }, target: 'static', diff --git a/readme.md b/readme.md index bc1a377..9d4c65d 100644 --- a/readme.md +++ b/readme.md @@ -1,5 +1,5 @@ # VueTube -BetterTube icon +VueTube icon An open source YouTube client ## Builds diff --git a/scripts/publish-android.sh b/scripts/publish-android.sh deleted file mode 100644 index decc720..0000000 --- a/scripts/publish-android.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env bash - -DIR=../android -LOG_OUTPUT=./tmp/capacitor-android.txt -CAP_VERSION=`grep '"version": ' ../package.json | awk '{print $2}' | tr -d '",'` -echo Attempting to build and publish Capacitor native libraries with version $CAP_VERSION - -# Make log dir if doesnt exist -mkdir -p ./tmp - -# Export ENV variable used by Gradle for Versioning -export CAP_VERSION - -# Get latest com.capacitorjs:core XML version info -CAPACITOR_PUBLISHED_URL="https://repo1.maven.org/maven2/com/capacitorjs/core/maven-metadata.xml" -CAPACITOR_PUBLISHED_DATA=$(curl -s $CAPACITOR_PUBLISHED_URL) -CAPACITOR_PUBLISHED_VERSION="$(perl -ne 'print and last if s/.*(.*)<\/latest>.*/\1/;' <<< $CAPACITOR_PUBLISHED_DATA)" - -# Check if we need to publish a new native version of the Capacitor Android library -if [[ $CAP_VERSION == $CAPACITOR_PUBLISHED_VERSION ]]; then - printf %"s\n" "Native Capacitor Android library version $CAPACITOR_PUBLISHED_VERSION is already published on MavenCentral, skipping." -else - printf %"s\n" "Latest native Capacitor Android library is version $CAPACITOR_PUBLISHED_VERSION, publishing to MavenCentral staging..." - - # Build and publish - $DIR/gradlew clean build --max-workers 1 -b $DIR/build.gradle -Pandroid.useAndroidX=true -Pandroid.enableJetifier=true > $LOG_OUTPUT 2>&1 - - echo $RESULT - - if grep --quiet "BUILD SUCCESSFUL" $LOG_OUTPUT; then - printf %"s\n" "Success: Capacitor Android Library published to MavenCentral Staging. Manually review and release from the Sonatype Repository Manager https://s01.oss.sonatype.org/" - else - printf %"s\n" "Error publishing, check $LOG_OUTPUT for more info!" - cat $LOG_OUTPUT - exit 1 - fi -fi