Skip to content

Commit

Permalink
Update mac_release.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
@pawelsalawa
pawelsalawa authored Feb 16, 2025
1 parent 4dafe8f commit 96516f8
Showing 1 changed file with 2 additions and 251 deletions.
253 changes: 2 additions & 251 deletions .github/workflows/mac_release.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,42 +8,7 @@ env:
INSTALLBUILDER_DIR: ../ib
INSTALLBUILDER_URL: https://releases.installbuilder.com/installbuilder/installbuilder-enterprise-24.11.1-osx-installer.dmg
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
# COMMON_PKGS:
# - brotli 1.1.0_0
# - dbus 1.14.10_1
# - double-conversion 3.3.0_0
# - freetype 2.13.2_0
# - gettext-runtime 0.22.5_0
# - giflib 4.2.3_1
# - glib2 2.78.4_1+x11
# - graphite2 1.3.14_0
# - harfbuzz 8.5.0_0
# - icu 74.2_0
# - jasper 4.2.4_0
# - lcms2 2.16_0
# - lerc 4.0.0_1
# - lz4 1.10.0_0
# - libdeflate 1.20_0
# - libedit 20240517-3.1_0
# - libffi 3.4.6_1
# - libiconv 1.17_0
# - libjpeg-turbo 3.0.3_0
# - libmng 2.0.3_1
# - libpng 1.6.43_0
# - ncurses 6.5_0
# - openssl3 3.3.1_1
# - pcre 8.45_0
# - pcre2 10.44_0
# - python39 3.9.19_0+lto+optimizations
# - tcl 8.6.14_0+corefoundation+threads
# - tiff 4.6.0_0
# - webp 1.4.0_0
# - xz 5.4.7_0
# - zlib 1.3.1_0
# - zstd 1.5.6_0
# - ccache 4.10.2_0+doc
# - hiredis 1.2.0_0


name: MacOSX release build

on:
Expand All @@ -65,145 +30,6 @@ jobs:
build:
runs-on: macos-13

# strategy:
# fail-fast: false
# matrix:
# binary_compatibility:
# - "darwin_16.x86_64" # macOS 10.12, the earliest version supported by QT 5.13
# - "darwin_17.x86_64" # macOS 10.13, the earliest version supported by QT 5.15
# - "darwin_18.x86_64" # macOS 10.14, the earliest version supported by QT 6.4
# - "darwin_20.x86_64" # macOS 11, the earliest version supported by QT 6.5
# - "darwin_20.arm64" # macOS 11, the earliest ARM64 version; temporarily no upstream binary packages
# - "darwin_21.arm64" # macOS 12, the earliest ARM64 version we have MacPorts binary packages for
# qt_version:
# - "5.13.2"
# - "5.15.12"
# - "6.4.3"
# exclude:
# - binary_compatibility: "darwin_16.x86_64"
# qt_version: "5.15.12"
# - binary_compatibility: "darwin_16.x86_64"
# qt_version: "6.4.3"
# - binary_compatibility: "darwin_17.x86_64"
# qt_version: "5.13.2"
# - binary_compatibility: "darwin_17.x86_64"
# qt_version: "6.4.3"
# - binary_compatibility: "darwin_18.x86_64"
# qt_version: "5.13.2"
# - binary_compatibility: "darwin_18.x86_64"
# qt_version: "5.15.12"
# - binary_compatibility: "darwin_21.arm64"
# qt_version: "5.13.2"
# include:
# this list is meant to be synchronized with mac_deps.yml
# - common_pkgs:
# - brotli 1.1.0_0
# - dbus 1.14.10_1
# - double-conversion 3.3.0_0
# - freetype 2.13.2_0
# - gettext-runtime 0.22.5_0
# - giflib 4.2.3_1
# - glib2 2.78.4_1+x11
# - graphite2 1.3.14_0
# - harfbuzz 8.5.0_0
# - icu 74.2_0
# - jasper 4.2.4_0
# - lcms2 2.16_0
# - lerc 4.0.0_1
# - lz4 1.10.0_0
# - libdeflate 1.20_0
# - libedit 20240517-3.1_0
# - libffi 3.4.6_1
# - libiconv 1.17_0
# - libjpeg-turbo 3.0.3_0
# - libmng 2.0.3_1
# - libpng 1.6.43_0
# - ncurses 6.5_0
# - openssl3 3.3.1_1
# - pcre 8.45_0
# - pcre2 10.44_0
# - python39 3.9.19_0+lto+optimizations
# - tcl 8.6.14_0+corefoundation+threads
# - tiff 4.6.0_0
# - webp 1.4.0_0
# - xz 5.4.7_0
# - zlib 1.3.1_0
# - zstd 1.5.6_0
# host_pkgs:
# - ccache 4.10.2_0+doc
# - hiredis 1.2.0_0
# - binary_compatibility: darwin_21.arm64
# qt_version: "5.15.12"
# cflags: -arch arm64 -mmacosx-version-min=11
# dmg_postfix: "-macos11.arm64"
# pkgs:
# - qt5-qtbase 5.15.12_1+openssl
# - qt5-qtdeclarative 5.15.12_0
# - qt5-qtimageformats 5.15.12_0
# - qt5-qtscript 5.15.12_0
# - qt5-qtsvg 5.15.12_0
# - qt5-qttools 5.15.12_0
# runner: macos-14
# runner_binary_compatibility: darwin_23.arm64
# - binary_compatibility: darwin_21.arm64
# qt_version: "6.4.3"
# cflags: -arch arm64 -mmacosx-version-min=11
# dmg_postfix: "-macos11.arm64-qt6"
# pkgs:
# - libb2 0.98.1_1
# - md4c 0.4.8_0
# - qt6-qtbase 6.4.3_6+openssl
# - qt6-qtdeclarative 6.4.3_0
# - qt6-qtimageformats 6.4.3_0
# - qt6-qtsvg 6.4.3_1
# - qt6-qttools 6.4.3_1
# - qt6-qt5compat 6.4.3_2
# runner: macos-14
# runner_binary_compatibility: darwin_23.arm64
# - binary_compatibility: darwin_18.x86_64
# qt_version: "6.4.3"
# cflags: -mmacosx-version-min=10.14
# dmg_postfix: "-macos10.14-qt6"
# pkgs:
# - libb2 0.98.1_1
# - md4c 0.4.8_0
# - qt6-qtbase 6.4.3_6+openssl
# - qt6-qtdeclarative 6.4.3_0
# - qt6-qtimageformats 6.4.3_0
# - qt6-qtsvg 6.4.3_1
# - qt6-qttools 6.4.3_1
# - qt6-qt5compat 6.4.3_2
# runner_binary_compatibility: darwin_21.x86_64
# - binary_compatibility: darwin_17.x86_64
# qt_version: "5.15.12"
# cflags: -arch x86_64 -mmacosx-version-min=10.13
# add_variants: ""
# dmg_postfix: "-macos10.13"
# pkgs:
# - qt5-qtbase 5.15.12_1+openssl
# - qt5-qtdeclarative 5.15.12_0
# - qt5-qtimageformats 5.15.12_0
# - qt5-qtscript 5.15.12_0
# - qt5-qtsvg 5.15.12_0
# - qt5-qttools 5.15.12_0
# qmake_flags: ""
# runner_binary_compatibility: darwin_21.x86_64
# - binary_compatibility: darwin_16.x86_64
# qt_version: "5.13.2"
# cflags: -arch x86_64 -mmacosx-version-min=10.12
# add_variants: ""
# dmg_postfix: "-macos10.12"
# pkgs:
# - legacy-support 1.2.4_0
# - qt513-qtbase 5.13.2_10+openssl
# - qt513-qtdeclarative 5.13.2_0
# - qt513-qtimageformats 5.13.2_3
# - qt513-qtscript 5.13.2_0
# - qt513-qtsvg 5.13.2_0
# - qt513-qttools 5.13.2_0
# qmake_flags: ""
# runner_binary_compatibility: darwin_21.x86_64

steps:
#- name: Debug
#shell: bash
Expand Down Expand Up @@ -255,6 +81,7 @@ jobs:
echo "tclConfig:"
ls -l /opt/local/lib/tclConfig.sh
cat /opt/local/lib/tclConfig.sh
- name: Qt installation dir
id: qt-installation-dir
Expand Down Expand Up @@ -288,13 +115,6 @@ jobs:
echo "GH_SCRIPTS=$(pwd)/gh-scripts/scripts" >> $GITHUB_ENV
echo "DEBUG=${{ inputs.DEBUG }}" >> $GITHUB_ENV
#- name: Fix Qt for MacOS 13
# shell: bash
# run: |
# TCFILE=$(find $Qt5_DIR/mkspecs/features -name toolchain.prf -type f -maxdepth 1)
# echo "Updating file: $TCFILE"
# sed -i '' 's/if(!darwin:clang)|intel_icc/if(!darwin:clang)|intel_icc|darwin/' $TCFILE

- name: Install the InstalBuilder
shell: bash
run: |
Expand All @@ -320,45 +140,6 @@ jobs:
# echo "python arch:"
# lipo -archs $(which python)

# - name: Restore distfiles packages cache
# id: cache-distfiles
# uses: actions/cache/restore@v4
# with:
# path: distfiles
# key: distfiles-${{ matrix.binary_compatibility }}--${{ github.sha }}
# restore-keys: distfiles-${{ matrix.binary_compatibility }}--

# - name: Install MacPorts packages
# run: |
# mkdir macports
# install_binpkg() {
# _compat="$1"; shift
# while [ -n "$1" ]; do
# local _postfix="$(echo "$2${{ matrix.add_variants}}" | sed 's/+x11+universal/+universal+x11/')"
# _pkg="distfiles/$1-$_postfix.$_compat.tbz2"
# echo "Installing $_pkg"
# tar -C macports -xjf "$_pkg"
# shift 2
# done
# }
# install_binpkg ${{ matrix.runner_binary_compatibility }} ${{ join(matrix.host_pkgs, ' ') }}
# install_binpkg ${{ matrix.binary_compatibility }} ${{ join(matrix.common_pkgs, ' ') }} ${{ join(matrix.pkgs, ' ') }}

# - name: Configure MacPorts packages
# run: |
# sudo ln -s $(pwd)/macports/opt/local /opt/
# case "${{ join(matrix.pkgs, ' ') }}" in
# *qt6*) echo "PATH=/opt/local/libexec/qt6/bin:/opt/local/bin:$PATH" >> $GITHUB_ENV ;;
# *) echo "PATH=/opt/local/libexec/qt5/bin:/opt/local/bin:$PATH" >> $GITHUB_ENV ;;
# esac
# echo "pythonLocation=/opt/local/Library/Frameworks/Python.framework/Versions/$PYTHON_VERSION" >> $GITHUB_ENV

# if [ ${{ matrix.binary_compatibility }} = "darwin_16.x86_64" ]; then
# QtImageFormats 5.13 binary is linked to an older version of libtiff
# sudo install_name_tool -change /opt/local/lib/libtiff.5.dylib /opt/local/lib/libtiff.6.dylib \
# /opt/local/libexec/qt5/plugins/imageformats/libqtiff.dylib
# fi

- name: Prepare ccache
if: inputs.use_ccache || false
uses: hendrikmuhs/[email protected]
Expand Down Expand Up @@ -525,33 +306,3 @@ jobs:
with:
name: SQLiteStudio-${{ env.PACKAGE_VERSION }}-installer.dmg
path: SQLiteStudio-${{ env.PACKAGE_VERSION }}-installer.dmg

# build-universal:
# runs-on: macos-12 # Don't use newer versions yet, https://github.com/actions/runner-images/issues/7522
# needs: build
# steps:
# - uses: actions/checkout@v4
# with:
# ref: ${{ github.event.client_payload.branch }}

# - uses: actions/download-artifact@v4
# with:
# pattern: sqlitestudio-[0-9].[0-9].[0-9]-macos10.13.dmg
# merge-multiple: true

# - uses: actions/download-artifact@v4
# with:
# pattern: sqlitestudio-[0-9].[0-9].[0-9]-macos11.arm64.dmg
# merge-multiple: true

# - run: |
# set -x
# _prefix="$(echo sqlitestudio-[0-9].[0-9].[0-9]-macos11.arm64.dmg | sed 's/11.arm64.dmg$//')"
# SQLiteStudio3/create_macosx_bundle.sh -u "${_prefix}10.13.dmg" "${_prefix}11.arm64.dmg" "${_prefix}-universal.dmg"
# echo "PACKAGE_NAME=${_prefix}-universal.dmg" >> $GITHUB_ENV

# - name: Upload package artifact
# uses: actions/upload-artifact@v4
# with:
# name: ${{ env.PACKAGE_NAME }}
# path: ${{ env.PACKAGE_NAME }}

0 comments on commit 96516f8

Please sign in to comment.