From 4aef284073d704ce646b602c0ce05cfa54fc5a45 Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Fri, 19 Apr 2024 15:03:14 +0200
Subject: [PATCH] Fix issue that marks iOS releases as pre-releases (#2288)

---
 .github/workflows/ios-ci.yml          |  2 +-
 .github/workflows/ios-pre-release.yml | 85 ---------------------------
 2 files changed, 1 insertion(+), 86 deletions(-)
 delete mode 100644 .github/workflows/ios-pre-release.yml

diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml
index 18ce74f35..6b43cb8f1 100644
--- a/.github/workflows/ios-ci.yml
+++ b/.github/workflows/ios-ci.yml
@@ -287,7 +287,7 @@ jobs:
             MapLibre.dynamic.xcframework.zip
             ${{ env.debug_symbols_ios }}
           tag_name: ios-v${{ env.version }}
-          prerelease: ${{ !github.event.inputs.release }}
+          prerelease: ${{ github.event.inputs.release == 'pre' }}
           body_path: platform/ios/changelog_for_version.md
           fail_on_unmatched_files: true
 
diff --git a/.github/workflows/ios-pre-release.yml b/.github/workflows/ios-pre-release.yml
deleted file mode 100644
index 6de22e067..000000000
--- a/.github/workflows/ios-pre-release.yml
+++ /dev/null
@@ -1,85 +0,0 @@
-name: ios-pre-release
-
-on:
-  workflow_dispatch:
-  
-jobs:
-  build:
-    #runs-on: macos-12
-    runs-on: [self-hosted]
-    env:
-      BUILDTYPE: Release
-      HOMEBREW_NO_AUTO_UPDATE: 1
-      HOMEBREW_NO_INSTALL_CLEANUP: 1
-    defaults:
-      run:
-        working-directory: platform/ios
-        shell: bash 
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          submodules: recursive
-          fetch-depth: 0
-      
-      - name: Install macos dependencies
-        run: |
-          which brew || /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-          brew list cmake 1> /dev/null || brew install cmake
-          brew list ccache 1> /dev/null || brew install ccache
-          brew list pkg-config 1> /dev/null || brew install pkg-config
-          brew list glfw 1> /dev/null || brew install glfw
-          brew list node 1> /dev/null || brew install node
-          gem list -i xcpretty || sudo gem install xcpretty
-
-      - name: Cache node modules
-        uses: actions/cache@v4
-        env:
-          cache-name: cache-node-modules
-        with:
-          path: ~/.npm
-          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-build-${{ env.cache-name }}-
-            ${{ runner.os }}-build-
-            ${{ runner.os }}-
-
-      - name: npm install
-        run: npm install --ignore-scripts          
-
-      - name: Prepare ccache
-        run: ccache --clear       
-
-      - name: Cache ccache
-        uses: actions/cache@v4
-        env:
-          cache-name: ccache-v1     
-        with:
-          path: ~/.ccache'
-          key: ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}-${{ github.ref }}-${{ github.sha }}-${{ github.head_ref }}
-          restore-keys: |
-            ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}-${{ github.ref }}-${{ github.sha }}
-            ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}-${{ github.ref }}
-            ${{ env.cache-name }}-${{ runner.os }}-${{ github.job }}  
-
-      - name: Clear ccache statistics
-        run: |
-          ccache --zero-stats
-          ccache --max-size=2G
-          ccache --show-stats            
-
-      - name: Install iOS packaging dependencies
-        run: |
-          ./platform/ios/scripts/install-packaging-dependencies.sh
-        env:
-          CILAUNCH: true
-
-      # - name: Set XCode version
-      #   run: |
-      #     sudo xcode-select --switch /Applications/Xcode12.4.app          
-
-      - name: Build, package, and upload iOS release
-        run: platform/ios/scripts/deploy-swift-package.sh
-        env:
-          DIST_GITHUB_TOKEN: ${{ secrets.DIST_GITHUB_TOKEN }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}