diff --git a/.github/actions/install-dependencies/action.yaml b/.github/actions/install-dependencies/action.yaml index 4c29802528..f44d9da593 100644 --- a/.github/actions/install-dependencies/action.yaml +++ b/.github/actions/install-dependencies/action.yaml @@ -20,7 +20,14 @@ runs: if [[ ${RUNNER_ARCH} == "ARM64" ]]; then sudo apt-get install -y gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu fi - - if: runner.os == 'macOS' + - name: install dependencies for arm64 + if: runner.os == 'Linux' && runner.arch == 'arm64' + shell: bash + run: | + sudo rm -f /etc/apt/sources.list.d/google-chrome.list + sudo apt-get update -y + sudo apt-get install -y socat gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu make jq uidmap + - if: runner.os == 'macOS' && runner.arch == 'amd64' name: install macOS dependencies shell: bash env: @@ -45,6 +52,8 @@ runs: if [[ ${RUNNER_ARCH} == "ARM64" ]]; then brew install jq fi + - if: runner.os == 'macOS' # remove once docker is pre-installed on macOS images + uses: douglascamata/setup-docker-macos-action@v1-alpha - if: runner.os == 'Windows' name: install make and zip uses: nick-fields/retry/@v3 diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml index aa5220f923..7ebdb5180f 100644 --- a/.github/workflows/dev.yaml +++ b/.github/workflows/dev.yaml @@ -49,32 +49,21 @@ jobs: runners: - ubuntu-latest - ubuntu-arm64 - - macos-latest # this runner uses arm64 - - windows-2019 - clusters: - - distribution: Kubeception - version: "1.29" + - macos-13 # Ensure amd64 (see https://github.com/marketplace/actions/setup-docker-on-macos) + - windows-latest runs-on: ${{ matrix.runners }} needs: build_image steps: + - name: Create k8s Kind Cluster + uses: helm/kind-action@v1 + with: + config: ${{ env.KUBECONFIG }} - uses: actions/checkout@v4 with: fetch-depth: 0 ref: "${{ github.event.pull_request.head.sha }}" - name: install dependencies uses: ./.github/actions/install-dependencies - - name: install dependencies for arm64 - if: runner.os == 'Linux' && runner.arch == 'arm64' - run: | - sudo rm -f /etc/apt/sources.list.d/google-chrome.list - sudo apt-get update -y - sudo apt-get install -y socat gcc-aarch64-linux-gnu binutils-aarch64-linux-gnu make jq uidmap - - name: install docker for arm64 - if: runner.os == 'Linux' && runner.arch == 'arm64' - run: | - curl -fsSL https://get.docker.com -o get-docker.sh - sudo sh get-docker.sh - dockerd-rootless-setuptool.sh install - name: Build client env: TELEPRESENCE_VERSION: ${{needs.build_image.outputs.telepresenceVersion}} @@ -84,16 +73,6 @@ jobs: env: TELEPRESENCE_VERSION: ${{needs.build_image.outputs.telepresenceVersion}} run: make client-image - - name: Create cluster - uses: datawire/infra-actions/provision-cluster@v0.2.7 - with: - kubeconfig: ${{ env.KUBECONFIG }} - kubeceptionToken: ${{ secrets.DEV_TELEPRESENCE_KUBECEPTION_TOKEN }} - kubeceptionProfile: small - lifespan: 7200 - distribution: ${{ matrix.clusters.distribution }} - version: ${{ matrix.clusters.version }} - gkeCredentials: '{"project_id": "foo"}' # See https://github.com/datawire/infra-actions/issues/66 - name: Download prebuilt docker image uses: actions/download-artifact@v3 with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index da54459a77..17ed209cfe 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -17,7 +17,7 @@ jobs: - ubuntu-latest - ubuntu-arm64 - macos-latest - - windows-2019 + - windows-latest runs-on: ${{ matrix.runners }} steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/unit_tests.yaml b/.github/workflows/unit_tests.yaml index 4f6a03cbc9..3aca9b6977 100644 --- a/.github/workflows/unit_tests.yaml +++ b/.github/workflows/unit_tests.yaml @@ -11,8 +11,8 @@ jobs: runners: - ubuntu-latest - ubuntu-arm64 - - macos-latest - - windows-2019 + - macos-13 + - windows-latest runs-on: ${{ matrix.runners }} steps: - uses: actions/checkout@v4