From 950538df6a9e39c3b4bf11ca53f7c118ea98e0db Mon Sep 17 00:00:00 2001 From: Steven Phillips Date: Wed, 7 Aug 2024 23:34:53 +0100 Subject: [PATCH] Fixed error message broke macos-intel into separate build and fixed openssl dylib path issues --- .github/workflows/build-macos-apple.yml | 101 ++++++++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 .github/workflows/build-macos-apple.yml diff --git a/.github/workflows/build-macos-apple.yml b/.github/workflows/build-macos-apple.yml new file mode 100644 index 00000000..ab2d9400 --- /dev/null +++ b/.github/workflows/build-macos-apple.yml @@ -0,0 +1,101 @@ +name: Build macos-apple (macos-latest) + +on: + workflow_dispatch: + branches: [ master ] + +jobs: + build: + runs-on: macos-latest + name: Build on ${{ matrix.distro }} ${{ matrix.arch }} + + steps: + - name: Install dependencies + run: | + echo INFO: uname -a + uname -a + echo INFO: sw_vers + sw_vers + echo INFO: OpenSSL 1 + ls /opt/homebrew/opt/openssl@3/ + echo INFO: OpenSSL 2 + ls /opt/homebrew/opt/openssl@3/lib + brew install xquartz + + - name: Checkout code + uses: actions/checkout@v4 + + - name: Compile macos-apple mec + run: | + mkdir downloads + mkdir packages + cd ./microemacs/src + ./build.sh -t c -a apple + - name: Compile macos-apple mew + run: | + cd ./microemacs/src + ./build.sh -t w -a apple + - name: Create macos-apple binaries download + run: | + cd ./microemacs/bin + mv macos14-apple64-* macos14-apple64 + rm ./.gitignore + cd .. + export MEVER=`./bin/macos14-apple64/mec -p @contribs/ver.emf` + zip -r ../downloads/Jasspa_MicroEmacs_${MEVER}_macos_apple_binaries bin license.txt readme.txt + + - name: Create macos-apple mecs + run: | + export MEVER=`./microemacs/bin/macos14-apple64/mec -p @microemacs/contribs/ver.emf` + cd ./microemacs/mesingle + rm -rf bin + mkdir -p bin/macos14-apple64 + ../bin/macos14-apple64/mec -p "@mesgen" -f -p ../bin/macos14-apple64/mec -t ../bin/macos14-apple64/tfs -o bin/macos14-apple64/mecs + cp ../license.txt ./ + cp ../readme.txt ./ + zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_macos_apple_mecs bin license.txt readme.txt + + - name: Create macos-apple mews + run: | + export MEVER=`./microemacs/bin/macos14-apple64/mec -p @microemacs/contribs/ver.emf` + cd ./microemacs/mesingle + rm -rf bin + mkdir -p bin/macos14-apple64 + ../bin/macos14-apple64/mec -p "@mesgen" -f -p ../bin/macos14-apple64/mew -t ../bin/macos14-apple64/tfs -o bin/macos14-apple64/mews + zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_macos_apple_mews bin license.txt readme.txt + + - name: Create macos-apple OpenSSL download + run: | + cd ./microemacs/ + export MEVER=`./bin/macos14-apple64/mec -p @contribs/ver.emf` + rm -rf tfs + mkdir -p tfs/bin/macos14-apple64 + cd tfs/bin/macos14-apple64 + cp /opt/homebrew/opt/openssl@3/lib/libcrypto.3.dylib . + cp /opt/homebrew/opt/openssl@3/lib/libssl.3.dylib . + cp /opt/homebrew/opt/openssl@3/LICENSE.txt . + cp /opt/homebrew/opt/openssl@3/README.md . + CRYPT_PATH=`otool -L libssl.3.dylib | grep libcrypt | cut -f 1 -d ' '` + install_name_tool -id @loader_path/libcrypto.3.dylib libcrypto.3.dylib + install_name_tool -id @loader_path/libssl.3.dylib libssl.3.dylib + install_name_tool -change $CRYPT_PATH @loader_path/libcrypto.3.dylib libssl.3.dylib + echo OTOOL crypto + otool -L libcrypto.3.dylib + echo OTOOL ssl + otool -L libssl.3.dylib + cd ../.. + zip -r ../../downloads/Jasspa_MicroEmacs_${MEVER}_macos_apple_openssl bin + cd .. + ./bin/macos14-apple64/tfs -o ../packages/Jasspa_MicroEmacs_${MEVER}_macos_apple64_openssl.tfs -a ./mesingle/tfs_hd tfs + + - name: Upload macos-apple downloads + uses: actions/upload-artifact@v4 + with: + name: macos-apple-downloads + path: downloads + + - name: Upload macos-apple packages + uses: actions/upload-artifact@v4 + with: + name: macos-apple-packages + path: packages