diff --git a/.github/workflows/macos_build.yml b/.github/workflows/macos_build.yml index 2d9055c871f..5c0d023602a 100644 --- a/.github/workflows/macos_build.yml +++ b/.github/workflows/macos_build.yml @@ -42,7 +42,7 @@ jobs: uses: actions/cache@v3 with: path: ~/conda_pkgs_dir - key: conda-macos-3-9-${{ hashFiles('build/conda/conda-3-9-env-full.yaml') }} + key: conda-macos-3-9-${{ hashFiles('build/conda/conda-3-9-env.yaml') }} # Set up miniconda using the environment yaml file within the repo - name: Setup Miniconda uses: conda-incubator/setup-miniconda@v2.2.0 @@ -52,7 +52,7 @@ jobs: channels: conda-forge,defaults show-channel-urls: true channel-priority: flexible - environment-file: build/conda/conda-3-9-env-full.yaml + environment-file: build/conda/conda-3-9-env.yaml activate-environment: build_env auto-activate-base: false use-only-tar-bz2: true # Needed for caching some reason @@ -61,7 +61,8 @@ jobs: run: | pip list python -m pip install -r requirements-full.txt - pip install openbb + pip install -e . + pip list - name: Build Bundle run: build/pyinstaller/build4mac.sh @@ -99,7 +100,7 @@ jobs: run: | security unlock-keychain -p $MACOS_INSTALLER_KEYCHAIN_PWD install.keychain build/pyinstaller/macOS/build-macos.sh OpenBBTerminal 0.0.1 - mv build/pyinstaller/macOS/target/pkg/OpenBBTerminalM1.pkg OpenBBTerminalM1.pkg + mv build/pyinstaller/macOS/target/pkg/OpenBBTerminalM1.pkg OpenBBTerminal.pkg shell: bash - name: Deleting Previous Keychain @@ -119,11 +120,11 @@ jobs: NOTARIZE_APPLE_PWD: ${{ secrets.NOTARIZE_APPLE_PWD }} NOTARIZE_APPLE_TEAM_ID: ${{ secrets.NOTARIZE_APPLE_TEAM_ID }} run: | - xcrun notarytool submit OpenBBTerminalM1.pkg --apple-id "$NOTARIZE_APPLE_ID" --password "$NOTARIZE_APPLE_PWD" --team-id "$NOTARIZE_APPLE_TEAM_ID" --wait + xcrun notarytool submit OpenBBTerminal.pkg --apple-id "$NOTARIZE_APPLE_ID" --password "$NOTARIZE_APPLE_PWD" --team-id "$NOTARIZE_APPLE_TEAM_ID" --wait - name: Staple run: | - xcrun stapler staple OpenBBTerminalM1.pkg + xcrun stapler staple OpenBBTerminal.pkg - name: Clean up Build Artifacts run: | @@ -135,12 +136,12 @@ jobs: uses: actions/upload-artifact@v3 with: name: ${{ matrix.items.name }} - path: OpenBBTerminalM1.pkg + path: OpenBBTerminal.pkg - name: Get contents from PkgUtil run: | - pkgutil --expand-full OpenBBTerminalM1.pkg extract/ - rm -rf OpenBBTerminalM1.pkg + pkgutil --expand-full OpenBBTerminal.pkg extract/ + rm -rf OpenBBTerminal.pkg - name: Run Integration Tests run: | @@ -152,8 +153,8 @@ jobs: uses: adrey/slack-file-upload-action@master with: token: ${{ secrets.SLACK_API_TOKEN }} - initial_comment: "M1 MacOs Build Integration test summary" - title: "M1 MacOs Build Integration test summary" + initial_comment: "MacOs Build Integration test summary" + title: "MacOs Build Integration test summary" path: failed_tests.txt channel: ${{ secrets.SLACK_CHANNEL_ID }}