Skip to content

Commit

Permalink
Merge pull request #427 from gefyrahq/fix-mac-build
Browse files Browse the repository at this point in the history
fix(ci): reset cache / use output flag for mac build
  • Loading branch information
SteinRobert committed Sep 7, 2023
2 parents e543b25 + 3e442c7 commit ce61565
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dist-build-mac.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
run: |
# Turn our base64-encoded certificate back to a regular .p12 file
echo $MACOS_CERTIFICATE | base64 --decode > certificate.p12
echo $MACOS_CERTIFICATE | base64 --decode -o certificate.p12
# We need to create a new keychain, otherwise using the certificate will prompt
# with a UI dialog asking for the certificate password, which we can't
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/python-tester.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.local # the path depends on the OS
key: poetry-py-1 # increment to reset cache
key: poetry-py-2 # increment to reset cache
- name: Install Poetry
uses: snok/install-poetry@v1
with:
Expand All @@ -190,11 +190,11 @@ jobs:
uses: actions/cache@v3
with:
path: ./client/.venv
key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}-py-1
key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}-py-2
- name: Install dependencies
working-directory: ./client
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
run: poetry install --no-interaction --no-root
run: poetry install --with dev --no-interaction --no-root
- name: Install k3d
run: curl --silent --fail https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | TAG=v5.5.1 bash
- name: Run PyTest
Expand Down Expand Up @@ -288,7 +288,7 @@ jobs:
- name: Install dependencies
working-directory: ./client
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
run: poetry install --no-interaction --no-root
run: poetry install --with dev --no-interaction --no-root
- name: Run gefyra up
timeout-minutes: 8
working-directory: ./client
Expand Down Expand Up @@ -392,11 +392,11 @@ jobs:
uses: actions/cache@v3
with:
path: ./client/.venv
key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}-test-1
key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}-test-2
- name: Pytest
working-directory: ./client
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
run: poetry install --no-interaction --no-root
run: poetry install --with dev --no-interaction --no-root
# Run the 'Try it yourself'
- name: Apply some workload
run: |
Expand Down Expand Up @@ -462,11 +462,11 @@ jobs:
uses: actions/cache@v3
with:
path: ./operator/.venv
key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}-py-1
key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}-py-2
- name: Install dependencies
working-directory: ./operator
if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
run: poetry install --no-interaction --no-root
run: poetry install --with dev --no-interaction --no-root
- name: Install k3d
run: curl --silent --fail https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | TAG=v5.5.1 bash
- name: Run PyTest
Expand Down
1 change: 1 addition & 0 deletions client/pyoxidizer.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ register_target("resources", make_embedded_resources, depends=["exe"], default_b
register_target("wininstall", make_install, depends=["winexe"], default=True)
register_target("msi_installer", make_msi, depends=["winexe"])


# Resolve whatever targets the invoker of this configuration file is requesting
# be resolved.
resolve_targets()

0 comments on commit ce61565

Please sign in to comment.