diff --git a/.github/workflows/dist-build-mac.yaml b/.github/workflows/dist-build-mac.yaml index 83d8e67e..c74c5061 100644 --- a/.github/workflows/dist-build-mac.yaml +++ b/.github/workflows/dist-build-mac.yaml @@ -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 diff --git a/.github/workflows/python-tester.yaml b/.github/workflows/python-tester.yaml index 60e7cf08..34e565a2 100644 --- a/.github/workflows/python-tester.yaml +++ b/.github/workflows/python-tester.yaml @@ -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: @@ -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 @@ -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 @@ -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: | @@ -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 diff --git a/client/pyoxidizer.bzl b/client/pyoxidizer.bzl index c5b6edb9..a5fa7cd7 100644 --- a/client/pyoxidizer.bzl +++ b/client/pyoxidizer.bzl @@ -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()