revert deploy build action
This commit is contained in:
Macbook
parent
a33da4058d
commit
d63bab3113
4 changed files with 3 additions and 114 deletions
66
.github/workflows/deploy.yml
vendored
66
.github/workflows/deploy.yml
vendored
|
|
@ -294,70 +294,6 @@ jobs:
|
||||||
path: deploy/build/client/AmneziaVPN.app
|
path: deploy/build/client/AmneziaVPN.app
|
||||||
retention-days: 7
|
retention-days: 7
|
||||||
|
|
||||||
# ------------------------------------------------------
|
|
||||||
# Build-MacOS-NE:
|
|
||||||
# runs-on: macos-latest
|
|
||||||
|
|
||||||
# env:
|
|
||||||
# QT_VERSION: 6.4.3
|
|
||||||
# QIF_VERSION: 4.6
|
|
||||||
# QT_MIRROR: https://mirrors.ocf.berkeley.edu/qt/
|
|
||||||
# PROD_AGW_PUBLIC_KEY: ${{ secrets.PROD_AGW_PUBLIC_KEY }}
|
|
||||||
# DEV_AGW_PUBLIC_KEY: ${{ secrets.DEV_AGW_PUBLIC_KEY }}
|
|
||||||
|
|
||||||
# steps:
|
|
||||||
# - name: 'Setup Xcode'
|
|
||||||
# uses: maxim-lobanov/setup-xcode@v1
|
|
||||||
# with:
|
|
||||||
# xcode-version: '14.3.1'
|
|
||||||
|
|
||||||
# - name: 'Install desktop Qt'
|
|
||||||
# uses: jurplel/install-qt-action@v3
|
|
||||||
# with:
|
|
||||||
# version: ${{ env.QT_VERSION }}
|
|
||||||
# host: 'mac'
|
|
||||||
# target: 'desktop'
|
|
||||||
# modules: 'qtremoteobjects qt5compat qtshadertools qtmultimedia'
|
|
||||||
# arch: 'clang_64'
|
|
||||||
# dir: ${{ runner.temp }}
|
|
||||||
# set-env: 'true'
|
|
||||||
# extra: '--base ${{ env.QT_MIRROR }}'
|
|
||||||
# - name: 'Install Qt Installer Framework ${{ env.QIF_VERSION }}'
|
|
||||||
# run: |
|
|
||||||
# mkdir -pv ${{ runner.temp }}/Qt/Tools/QtInstallerFramework
|
|
||||||
# wget https://qt.amzsvc.com/tools/ifw/${{ env.QIF_VERSION }}.zip
|
|
||||||
# unzip ${{ env.QIF_VERSION }}.zip -d ${{ runner.temp }}/Qt/Tools/QtInstallerFramework/
|
|
||||||
# - name: 'Install Go'
|
|
||||||
# uses: actions/setup-go@v5
|
|
||||||
# with:
|
|
||||||
# go-version: '1.22.1'
|
|
||||||
# cache: false
|
|
||||||
|
|
||||||
# - name: 'Get sources'
|
|
||||||
# uses: actions/checkout@v4
|
|
||||||
# with:
|
|
||||||
# submodules: 'true'
|
|
||||||
# fetch-depth: 10
|
|
||||||
|
|
||||||
# - name: 'Install dependencies'
|
|
||||||
# run: pip install jsonschema jinja2
|
|
||||||
|
|
||||||
# - name: 'Set execute permissions for deploy script'
|
|
||||||
# run: chmod +x deploy/build_macos_ne.sh
|
|
||||||
|
|
||||||
# - name: 'Build and deploy macOS NE'
|
|
||||||
# run: |
|
|
||||||
# export QT_BIN_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos/bin"
|
|
||||||
# export QIF_BIN_DIR="${{ runner.temp }}/Qt/Tools/QtInstallerFramework/${{ env.QIF_VERSION }}/bin"
|
|
||||||
# export QT_MACOS_ROOT_DIR="${{ runner.temp }}/Qt/${{ env.QT_VERSION }}/macos"
|
|
||||||
# bash deploy/build_macos_ne.sh
|
|
||||||
# env:
|
|
||||||
# APPSTORE_CONNECT_KEY_ID: ${{ secrets.APPSTORE_CONNECT_KEY_ID }}
|
|
||||||
# APPSTORE_CONNECT_ISSUER_ID: ${{ secrets.APPSTORE_CONNECT_ISSUER_ID }}
|
|
||||||
# APPSTORE_CONNECT_PRIVATE_KEY: ${{ secrets.APPSTORE_CONNECT_PRIVATE_KEY }}
|
|
||||||
# MAC_TRUST_CERT_BASE64: ${{ secrets.IOS_TRUST_CERT_BASE64 }}
|
|
||||||
# MAC_SIGNING_CERT_BASE64: ${{ secrets.IOS_SIGNING_CERT_BASE64 }}
|
|
||||||
# MAC_SIGNING_CERT_PASSWORD: ${{ secrets.IOS_SIGNING_CERT_PASSWORD }}
|
|
||||||
# ------------------------------------------------------
|
# ------------------------------------------------------
|
||||||
|
|
||||||
Build-Android:
|
Build-Android:
|
||||||
|
|
@ -508,7 +444,7 @@ jobs:
|
||||||
path: deploy/build/AmneziaVPN-release.aab
|
path: deploy/build/AmneziaVPN-release.aab
|
||||||
compression-level: 0
|
compression-level: 0
|
||||||
retention-days: 7
|
retention-days: 7
|
||||||
|
|
||||||
Extra:
|
Extra:
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
steps:
|
steps:
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,7 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
|
||||||
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
|
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
|
||||||
set(MZ_PLATFORM_NAME "wasm")
|
set(MZ_PLATFORM_NAME "wasm")
|
||||||
endif()
|
endif()
|
||||||
message(STATUS "Platform: ${MZ_PLATFORM_NAME}")
|
|
||||||
message(STATUS "Version: ${MACOS_NE}")
|
|
||||||
set(QT_BUILD_TOOLS_WHEN_CROSS_COMPILING ON)
|
set(QT_BUILD_TOOLS_WHEN_CROSS_COMPILING ON)
|
||||||
set(CMAKE_CXX_STANDARD 17)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
|
|
|
||||||
|
|
@ -183,7 +183,6 @@ else()
|
||||||
message("MACOS_NE is OFF")
|
message("MACOS_NE is OFF")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
if(NOT IOS AND NOT MACOS_NE)
|
if(NOT IOS AND NOT MACOS_NE)
|
||||||
message(" Add header for non-IOS and non-MACOS_NE")
|
message(" Add header for non-IOS and non-MACOS_NE")
|
||||||
set(HEADERS ${HEADERS}
|
set(HEADERS ${HEADERS}
|
||||||
|
|
@ -191,7 +190,6 @@ if(NOT IOS AND NOT MACOS_NE)
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
||||||
if(NOT ANDROID)
|
if(NOT ANDROID)
|
||||||
set(HEADERS ${HEADERS}
|
set(HEADERS ${HEADERS}
|
||||||
${CMAKE_CURRENT_LIST_DIR}/ui/notificationhandler.h
|
${CMAKE_CURRENT_LIST_DIR}/ui/notificationhandler.h
|
||||||
|
|
@ -346,9 +344,8 @@ endif()
|
||||||
|
|
||||||
# Macos Network Extension doesn't need
|
# Macos Network Extension doesn't need
|
||||||
if(WIN32 OR (APPLE AND NOT IOS AND NOT MACOS_NE) OR (LINUX AND NOT ANDROID))
|
if(WIN32 OR (APPLE AND NOT IOS AND NOT MACOS_NE) OR (LINUX AND NOT ANDROID))
|
||||||
message("-----> Client desktop build")
|
message("Client desktop build")
|
||||||
add_compile_definitions(AMNEZIA_DESKTOP)
|
add_compile_definitions(AMNEZIA_DESKTOP)
|
||||||
message("-----> Add AMNEZIA_DESKTOP")
|
|
||||||
set(HEADERS ${HEADERS}
|
set(HEADERS ${HEADERS}
|
||||||
${CMAKE_CURRENT_LIST_DIR}/core/ipcclient.h
|
${CMAKE_CURRENT_LIST_DIR}/core/ipcclient.h
|
||||||
${CMAKE_CURRENT_LIST_DIR}/core/privileged_process.h
|
${CMAKE_CURRENT_LIST_DIR}/core/privileged_process.h
|
||||||
|
|
|
||||||
|
|
@ -1,43 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17506" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
|
|
||||||
<device id="ipad12_9rounded" orientation="portrait" layout="fullscreen" appearance="light"/>
|
|
||||||
<dependencies>
|
|
||||||
<deployment identifier="iOS"/>
|
|
||||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17505"/>
|
|
||||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
|
||||||
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
|
|
||||||
</dependencies>
|
|
||||||
<scenes>
|
|
||||||
<!--View Controller-->
|
|
||||||
<scene sceneID="EHf-IW-A2E">
|
|
||||||
<objects>
|
|
||||||
<viewController id="01J-lp-oVM" sceneMemberID="viewController">
|
|
||||||
<view key="view" contentMode="scaleToFill" id="gZ9-gc-3t5">
|
|
||||||
<rect key="frame" x="0.0" y="0.0" width="1024" height="1366"/>
|
|
||||||
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
|
|
||||||
<subviews>
|
|
||||||
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch.png" translatesAutoresizingMaskIntoConstraints="NO" id="q5g-aV-39U">
|
|
||||||
<rect key="frame" x="467" y="638" width="90" height="90"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstAttribute="width" constant="90" id="VFp-nz-h8O"/>
|
|
||||||
<constraint firstAttribute="height" constant="90" id="ZUg-Ud-mgE"/>
|
|
||||||
</constraints>
|
|
||||||
</imageView>
|
|
||||||
</subviews>
|
|
||||||
<viewLayoutGuide key="safeArea" id="Whf-X3-AA4"/>
|
|
||||||
<color key="backgroundColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
|
|
||||||
<constraints>
|
|
||||||
<constraint firstItem="q5g-aV-39U" firstAttribute="centerX" secondItem="gZ9-gc-3t5" secondAttribute="centerX" id="Ayw-bo-LVF"/>
|
|
||||||
<constraint firstItem="q5g-aV-39U" firstAttribute="centerY" secondItem="gZ9-gc-3t5" secondAttribute="centerY" id="YHd-Kc-J0u"/>
|
|
||||||
</constraints>
|
|
||||||
</view>
|
|
||||||
</viewController>
|
|
||||||
<placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
|
|
||||||
</objects>
|
|
||||||
<point key="canvasLocation" x="53" y="375"/>
|
|
||||||
</scene>
|
|
||||||
</scenes>
|
|
||||||
<resources>
|
|
||||||
<image name="launch.png" width="1024" height="1024"/>
|
|
||||||
</resources>
|
|
||||||
</document>
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue