From 1f20e5f3e96d029c1423fe9cf659f4eb3f1b48a8 Mon Sep 17 00:00:00 2001 From: Carly Gundy Date: Thu, 15 Aug 2024 17:37:23 +0200 Subject: [PATCH 01/12] point docker image to our fork --- images/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/Dockerfile b/images/Dockerfile index dd8437e1d27..d015cf75453 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -17,7 +17,7 @@ RUN export RUNNER_ARCH=${TARGETARCH} \ && tar xzf ./runner.tar.gz \ && rm runner.tar.gz -RUN curl -f -L -o runner-container-hooks.zip https://github.com/actions/runner-container-hooks/releases/download/v${RUNNER_CONTAINER_HOOKS_VERSION}/actions-runner-hooks-k8s-${RUNNER_CONTAINER_HOOKS_VERSION}.zip \ +RUN curl -f -L -o runner-container-hooks.zip https://github.com/dfinity/runner-container-hooks/releases/download/v${RUNNER_CONTAINER_HOOKS_VERSION}/actions-runner-hooks-k8s-${RUNNER_CONTAINER_HOOKS_VERSION}.zip \ && unzip ./runner-container-hooks.zip -d ./k8s \ && rm runner-container-hooks.zip From 3b9c15c73cbf9b1a394b8a29f8e61fd5c07ff444 Mon Sep 17 00:00:00 2001 From: Carly Gundy Date: Thu, 15 Aug 2024 17:37:38 +0200 Subject: [PATCH 02/12] dont add network --- src/Runner.Worker/ContainerOperationProvider.cs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Runner.Worker/ContainerOperationProvider.cs b/src/Runner.Worker/ContainerOperationProvider.cs index c5cccb77ef0..425539c074d 100644 --- a/src/Runner.Worker/ContainerOperationProvider.cs +++ b/src/Runner.Worker/ContainerOperationProvider.cs @@ -92,12 +92,16 @@ public async Task StartContainersAsync(IExecutionContext executionContext, objec // Create local docker network for this job to avoid port conflict when multiple runners run on same machine. // All containers within a job join the same network + /* + XXX: don't add network as we'll use --network host executionContext.Output("##[group]Create local container network"); var containerNetwork = $"github_network_{Guid.NewGuid().ToString("N")}"; await CreateContainerNetworkAsync(executionContext, containerNetwork); executionContext.JobContext.Container["network"] = new StringContextData(containerNetwork); executionContext.Output("##[endgroup]"); - + */ + var containerNetwork = "host"; + executionContext.JobContext.Container["network"] = new StringContextData(containerNetwork); foreach (var container in containers) { container.ContainerNetwork = containerNetwork; @@ -160,7 +164,8 @@ public async Task StopContainersAsync(IExecutionContext executionContext, object await StopContainerAsync(executionContext, container); } // Remove the container network - await RemoveContainerNetworkAsync(executionContext, containers.First().ContainerNetwork); + // XXX: we're using --network host + //await RemoveContainerNetworkAsync(executionContext, containers.First().ContainerNetwork); } private async Task StartContainerAsync(IExecutionContext executionContext, ContainerInfo container) From fed0e2d01fe8ebab49ef156dcf4d74fba6ffb419 Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Thu, 15 Aug 2024 17:51:09 +0200 Subject: [PATCH 03/12] update workflow to run on branch dind-network-host-patch --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index de94bcc4b26..3edb1bac874 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -8,7 +8,7 @@ on: jobs: check: - if: startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main' + if: startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dind-network-host-patch' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 1c07ef26fc3aa81badf5e60856e6c244e21ae61d Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Thu, 15 Aug 2024 18:04:53 +0200 Subject: [PATCH 04/12] Update release.yml --- .github/workflows/release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3edb1bac874..afa336f1ca8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,13 +2,13 @@ name: Runner CD on: workflow_dispatch: - push: + pull_request: paths: - releaseVersion jobs: check: - if: startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dind-network-host-patch' + if: startsWith(github.ref, 'refs/heads/releases/') || github.ref == 'refs/heads/main' runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 From 202886d7c5ab544f004d7724cd830cd492f65966 Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Mon, 19 Aug 2024 15:36:52 +0200 Subject: [PATCH 05/12] change it back --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index afa336f1ca8..de94bcc4b26 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,7 +2,7 @@ name: Runner CD on: workflow_dispatch: - pull_request: + push: paths: - releaseVersion From ac9c3355b420cd0c1a23585fabc6b255c548479b Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Mon, 19 Aug 2024 16:03:08 +0200 Subject: [PATCH 06/12] Update Dockerfile --- images/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/Dockerfile b/images/Dockerfile index d015cf75453..f743d347fba 100644 --- a/images/Dockerfile +++ b/images/Dockerfile @@ -13,11 +13,11 @@ RUN apt update -y && apt install curl unzip -y WORKDIR /actions-runner RUN export RUNNER_ARCH=${TARGETARCH} \ && if [ "$RUNNER_ARCH" = "amd64" ]; then export RUNNER_ARCH=x64 ; fi \ - && curl -f -L -o runner.tar.gz https://github.com/actions/runner/releases/download/v${RUNNER_VERSION}/actions-runner-${TARGETOS}-${RUNNER_ARCH}-${RUNNER_VERSION}.tar.gz \ + && curl -f -L -o runner.tar.gz https://github.com/dfinity/runner/releases/download/v${RUNNER_VERSION}/actions-runner-${TARGETOS}-${RUNNER_ARCH}-${RUNNER_VERSION}.tar.gz \ && tar xzf ./runner.tar.gz \ && rm runner.tar.gz -RUN curl -f -L -o runner-container-hooks.zip https://github.com/dfinity/runner-container-hooks/releases/download/v${RUNNER_CONTAINER_HOOKS_VERSION}/actions-runner-hooks-k8s-${RUNNER_CONTAINER_HOOKS_VERSION}.zip \ +RUN curl -f -L -o runner-container-hooks.zip https://github.com/actions/runner-container-hooks/releases/download/v${RUNNER_CONTAINER_HOOKS_VERSION}/actions-runner-hooks-k8s-${RUNNER_CONTAINER_HOOKS_VERSION}.zip \ && unzip ./runner-container-hooks.zip -d ./k8s \ && rm runner-container-hooks.zip From 4bf0e1bdb037a027720ef32c47e1c05bf9152b6a Mon Sep 17 00:00:00 2001 From: eric sciple Date: Thu, 3 Oct 2024 11:53:21 -0700 Subject: [PATCH 07/12] v2.320.0 release --- releaseVersion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releaseVersion b/releaseVersion index ef96e25e847..8084ad3118b 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ - +2.320.0 From 78f21670b4a58aff19b5189207f54eb2bee324d1 Mon Sep 17 00:00:00 2001 From: eric sciple Date: Thu, 3 Oct 2024 12:20:00 -0700 Subject: [PATCH 08/12] Fix release workflow to use distinct artifact names --- .github/workflows/release.yml | 37 +++++++++++++++++++++++++++++++---- 1 file changed, 33 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 73dc6477759..f4571b6cb8f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -117,12 +117,11 @@ jobs: working-directory: _package # Upload runner package tar.gz/zip as artifact. - # Since each package name is unique, so we don't need to put ${{matrix}} info into artifact name - name: Publish Artifact if: github.event_name != 'pull_request' uses: actions/upload-artifact@v4 with: - name: runner-packages + name: runner-packages-${{ matrix.runtime }} path: | _package @@ -134,10 +133,40 @@ jobs: - uses: actions/checkout@v3 # Download runner package tar.gz/zip produced by 'build' job - - name: Download Artifact + - name: Download Artifact (win-x64) uses: actions/download-artifact@v4 with: - name: runner-packages + name: runner-packages-win-x64 + path: ./ + - name: Download Artifact (win-arm64) + uses: actions/download-artifact@v4 + with: + name: runner-packages-win-arm64 + path: ./ + - name: Download Artifact (osx-x64) + uses: actions/download-artifact@v4 + with: + name: runner-packages-osx-x64 + path: ./ + - name: Download Artifact (osx-arm64) + uses: actions/download-artifact@v4 + with: + name: runner-packages-osx-arm64 + path: ./ + - name: Download Artifact (linux-x64) + uses: actions/download-artifact@v4 + with: + name: runner-packages-linux-x64 + path: ./ + - name: Download Artifact (linux-arm) + uses: actions/download-artifact@v4 + with: + name: runner-packages-linux-arm + path: ./ + - name: Download Artifact (linux-arm64) + uses: actions/download-artifact@v4 + with: + name: runner-packages-linux-arm64 path: ./ # Create ReleaseNote file From 1c412611be19a8029030a460be052f25988d83fd Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Mon, 2 Dec 2024 12:12:34 +0100 Subject: [PATCH 09/12] chore(IDX): upgrade to v2.321.0 --- releaseVersion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releaseVersion b/releaseVersion index 8084ad3118b..248da29093e 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.320.0 +2.321.0 From 6ea8a57f75c27f917e363deb348e1876e64a35a2 Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Tue, 25 Mar 2025 15:09:46 +0000 Subject: [PATCH 10/12] version bump --- releaseVersion | 2 +- src/runnerversion | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/releaseVersion b/releaseVersion index 248da29093e..4981c204f93 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.321.0 +2.323.0 diff --git a/src/runnerversion b/src/runnerversion index 248da29093e..4981c204f93 100644 --- a/src/runnerversion +++ b/src/runnerversion @@ -1 +1 @@ -2.321.0 +2.323.0 From e29731ac56336f98f553ca24602fdc002f8ca6bb Mon Sep 17 00:00:00 2001 From: Marko Kosmerl Date: Tue, 13 May 2025 10:50:31 +0200 Subject: [PATCH 11/12] version bump --- releaseVersion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releaseVersion b/releaseVersion index 4981c204f93..c0fbc63596d 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.323.0 +2.324.0 From 15f7371e7891cd2c87176730451605a6f10dd857 Mon Sep 17 00:00:00 2001 From: Carly Gundy <47304080+cgundy@users.noreply.github.com> Date: Wed, 4 Jun 2025 16:01:56 +0200 Subject: [PATCH 12/12] version bump --- releaseVersion | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/releaseVersion b/releaseVersion index c0fbc63596d..3ba5855e2dc 100644 --- a/releaseVersion +++ b/releaseVersion @@ -1 +1 @@ -2.324.0 +2.325.0