reorganize repo, optimize workflows and fix some icons (#1291)

* fix tiktok icon

* remove resolve_paths.sh; rename readme file to render it on GitHub

* reorganize repo

* add carbitlink

Author: flameshikari

.github/scripts/optimize_images.sh

@@ -1,12 +1,12 @@
 name: Build All
 run-name: ${{ inputs.release_type }} @ ${{ github.sha }}
 
-permissions:
-  contents: write
-
 concurrency:
   group: delta
 
+permissions:
+  contents: write
+
 on:
   workflow_dispatch:
     inputs:
@@ -36,11 +36,10 @@ on:
       changelog:
         description: Changelog (b64 encoded)
 
-
 env:
   token: ${{ secrets.PA_TOKEN || github.token }}
-  organization: Delta-Icons
   current_repo: ${{ github.repository }}
+  organization: Delta-Icons
   website_repo: Delta-Icons/delta-icons.github.io
   package_name: website.leifs.delta
 
@@ -51,26 +50,43 @@ jobs:
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         token: ${{ env.token }}
         fetch-depth: 0
 
-    - name: Export variables
-      run: |
-        python -u .github/scripts/resolve_paths.py -p >> $GITHUB_ENV
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v5
+      with:
+        add-job-summary: never
 
     - name: Setup Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
+        cache: gradle
         distribution: temurin
         java-version: 18
 
-    - name: Install dependencies
+    - name: Setup Python
+      uses: actions/setup-python@v6
+      with:
+        cache: pip
+        python-version: '3.13'
+
+    - name: Export vars
       run: |
-        sudo apt-get update
-        sudo apt-get install -y optipng
-        sudo pip install -r ${{ env.sd }}/requirements.txt
+        python -u resources/scripts/resolve_paths.py -p >> $GITHUB_ENV
+        due_on=$(TZ=UTC date --iso-8601=seconds -d "$(date +%Y-%m-01) +1 month") >> $GITHUB_ENV
+
+    - name: Install Python deps
+      run: |
+        pip install -r ${{ env.sd }}/requirements.txt
+
+    - name: Install Linux deps
+      uses: awalsh128/cache-apt-pkgs-action@latest
+      with:
+        packages: optipng
+        version: 1.0
 
     - name: Configure tools
       run: |
@@ -87,19 +103,26 @@ jobs:
           -r ${{ inputs.release_type }} \
           -v ${{ inputs.version_type }} >> $GITHUB_ENV
 
-    - name: Add new icons
+    - name: Add icons
       run: |
         python -u ${{ env.sd }}/add_icons_wrapper.py
 
-    - name: Set icon count
+    - name: Set icons count
       run: |
         python ${{ env.sd }}/count_icons.py -w
 
     - name: Optimize images
       run: |
-        bash ${{ env.sd }}/optimize_images.sh
+        latest_tag=$(git tag --sort version:refname | grep -v 'beta' | tail -n 1)
+        changes=$(git diff --name-only $latest_tag -- "***.png")
+        if [[ $latest_tag && $changes ]]; then
+            echo "Latest tag is $latest_tag; optimizing images since this tag"
+            optipng $changes || true
+        else
+            echo 'No release tag or changed files found, skip optimizing'
+        fi
 
-    - name: Sort appfilter and drawable
+    - name: Sort XMLs
       run: |
         cd ${{ env.sd }}
         python sort_appfilter.py -o
@@ -125,7 +148,7 @@ jobs:
 
         echo "changelog=$changelog_tmp" >> $GITHUB_ENV
 
-    - name: Commit pre-build changes
+    - name: Commit pre-release changes
       run: |
         git add \
           app/build.gradle \
@@ -178,15 +201,15 @@ jobs:
         mv -v *play*.apk ${{ env.filename }}.apk 2> /dev/null || true
         mv -v *play*.aab ${{ env.filename }}.aab 2> /dev/null || true
 
-    - name: Upload APKs to Artifacts
-      uses: actions/upload-artifact@v4
+    - name: Upload signed builds to Artifacts
+      uses: actions/upload-artifact@v5
       with:
         name: ${{ env.filename }}
         path: ${{ env.filename }}*.apk
         if-no-files-found: error
-        retention-days: 90
+        retention-days: 30
 
-    - name: Push pre-build changes
+    - name: Push pre-release changes
       uses: ad-m/github-push-action@master
       with:
         github_token: ${{ env.token }}
@@ -238,7 +261,7 @@ jobs:
         github.repository_owner == env.organization &&
         inputs.publish == true
 
-    - name: Update the requests list
+    - name: Update requests
       uses: benc-uk/workflow-dispatch@v1
       with:
         repo: ${{ github.repository }}
@@ -248,7 +271,7 @@ jobs:
         github.repository_owner == env.organization &&
         inputs.publish == true
 
-    - name: Promote beta to production channel
+    - name: Promote Google Play beta to production
       uses: kevin-david/promote-play-release@v1.1.0
       with:
         service-account-json-raw: ${{ secrets.SERVICE_ACCOUNT }}
@@ -260,7 +283,7 @@ jobs:
         inputs.release_type == 'prod' &&
         inputs.publish == true
 
-    - name: Update the website
+    - name: Update website
       uses: benc-uk/workflow-dispatch@v1
       with:
         token: ${{ env.token }}
@@ -271,10 +294,11 @@ jobs:
         inputs.release_type == 'prod' &&
         inputs.publish == true
 
-    - name: Close the current milestone
+    - name: Close current milestone
       uses: oinume/create-scheduled-milestone-action@main
+      continue-on-error: true
       with:
-        title: ${{ env.version }}
+        title: ${{ env.version_name }}
         state: closed
       env:
         GITHUB_TOKEN: ${{ env.token }}
@@ -283,11 +307,13 @@ jobs:
         inputs.release_type == 'prod' &&
         inputs.publish == true
 
-    - name: Open a new milestone
+    - name: Open new milestone
       uses: oinume/create-scheduled-milestone-action@main
+      continue-on-error: true
       with:
         title: ${{ env.version_next }}
         state: open
+        due_on: '${{ env.due_on }}'
       env:
         GITHUB_TOKEN: ${{ env.token }}
       if: |

.github/scripts/resolve_paths.sh

@@ -1,35 +1,48 @@
 name: Build FOSS
 run-name: foss @ ${{ github.sha }}
 
+concurrency:
+  group: delta
+
 on:
   workflow_dispatch:
 
-concurrency: ${{ github.ref }}
-
 jobs:
   build:
     name: Build
     runs-on: ubuntu-22.04
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@v5
+      with:
+        add-job-summary: never
+  
     - name: Setup Java
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
+        cache: gradle
         distribution: temurin
         java-version: 18
 
-    - name: Export variables
+    - name: Setup Python
+      uses: actions/setup-python@v6
+      with:
+        cache: pip
+        python-version: '3.13'
+
+    - name: Export vars
       run: |
-        python -u .github/scripts/resolve_paths.py -p >> $GITHUB_ENV
+        python -u resources/scripts/resolve_paths.py -p >> $GITHUB_ENV
 
-    - name: Install dependencies
+    - name: Install Python deps
       run: |
-        sudo pip install -r ${{ env.sd }}/requirements.txt
+        pip install -r ${{ env.sd }}/requirements.txt
 
-    - name: Add new icons
+    - name: Add icons
       run: |
         python -u ${{ env.sd }}/add_icons_wrapper.py
 
@@ -39,16 +52,16 @@ jobs:
         python -u ${{ env.sd }}/bump_version.py -w \
                -c "${GITHUB_SHA::7}|$(date +%s)"
 
-    - name: Set icon count
+    - name: Set icons count
       run: |
         python ${{ env.sd }}/count_icons.py -w
 
     - name: Create changelog
       run: |
-        python ${{ env.sd }}/create_changelog.py -p -w -r foss \
-               -x app/src/main/res/values/changelog.xml
+        python ${{ env.sd }}/create_changelog.py \
+          -p -w -r foss -x app/src/main/res/values/changelog.xml
 
-    - name: Sort appfilter and drawable
+    - name: Sort XMLs
       run: |
         cd ${{ env.sd }}
         python sort_appfilter.py -o
@@ -74,12 +87,12 @@ jobs:
         signingKeyBase64: ${{ secrets.KEYSTORE_BASE64 }}
         releaseDirectory: .
 
-    - name: Move signed APK
+    - name: Rename signed APK
       run: |
         mv -v ${{ steps.sign_step.outputs.signedReleaseFile }} ${{ env.filename }}.apk
 
-    - name: Upload signed APK in Artifacts
-      uses: actions/upload-artifact@v4
+    - name: Upload signed APK to Artifacts
+      uses: actions/upload-artifact@v5
       with:
         name: ${{ env.filename }}
         path: ${{ env.filename }}.apk

.github/workflows/build_all.yml

@@ -1,34 +1,33 @@
-name: Check Conflicts
+name: Check for Conflicts
 run-name: conflicts @ ${{ github.sha }}
 
 on:
   workflow_dispatch:
-  pull_request:
+  pull_requests:
     paths:
-      - app/src/main/rec/drawable-nodpi/**
       - contribs/**
 
 jobs:
   build:
-    name: Check Conflicts
+    name: Check for Conflicts
     runs-on: ubuntu-22.04
     defaults:
       run:
-        working-directory: .github/scripts
+        working-directory: resources/scripts
     steps:
 
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Setup Python
-      uses: actions/setup-python@v5
+      uses: actions/setup-python@v6
       with:
-        python-version: '3.10'
+        python-version: '3.13'
         cache: pip
 
-    - name: Install dependencies
+    - name: Install Python deps
       run: |
-        python -m pip install -r requirements.txt
+        pip install -r requirements.txt
 
     - name: Add icons
       run: |