upstream sync

.github/workflows/debug.yaml

@@ -0,0 +1,30 @@
+name: Debug WarpBuild Docker Bake Action
+
+on:
+  push:
+    branches:
+      - feat/warpbuild-remote-builder
+  workflow_dispatch:
+
+env:
+  WARPBUILD_API_DOMAIN: "https://api.dev.warpbuild.dev"
+
+jobs:
+  test-multi-warp:
+    name: Debug Run ${{ matrix.run_number }}
+    runs-on: warpdev-ubuntu-latest-x64-8x
+    strategy:
+      matrix:
+        run_number: [1,2,3]
+      fail-fast: false
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Bake all targets
+        uses: ./
+        with:
+          files: ./__tests__/bake.hcl
+          profile-name: benchmark-builder-dispatch
+
+

.github/workflows/release-new-action-version.yaml

@@ -0,0 +1,27 @@
+name: Release new action version
+
+on:
+  release:
+    types: [released]
+  workflow_dispatch:
+    inputs:
+      TAG_NAME:
+        description: 'Tag name that the major tag will point to'
+        required: true
+
+env:
+  TAG_NAME: ${{ github.event.inputs.TAG_NAME || github.event.release.tag_name }}
+permissions:
+  contents: write
+
+jobs:
+  update_tag:
+    name: Update the major tag to include the ${{ github.event.inputs.TAG_NAME || github.event.release.tag_name }} changes
+    environment:
+      name: releaseNewActionVersion
+    runs-on: ubuntu-latest
+    steps:
+      - name: Update the ${{ env.TAG_NAME }} tag
+        uses: actions/publish-action@v0.2.2
+        with:
+          source-tag: ${{ env.TAG_NAME }}

README.md

@@ -46,24 +46,22 @@ on:
 
 jobs:
   bake:
-    runs-on: ubuntu-latest
+    runs-on: warp-ubuntu-latest-x64-4x
     steps:
       -
         name: Login to DockerHub
         uses: docker/login-action@v3
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
       -
         name: Build and push
-        uses: docker/bake-action@v6
+        uses: Warpbuilds/bake-action@v6
         with:
           push: true
           set: |
             *.tags=user/app:latest
+          profile-name: super-fast-builder
 ```
 
 Be careful because **any file mutation in the steps that precede the build step
@@ -80,12 +78,13 @@ to the default Git context:
 ```yaml
       -
         name: Build and push
-        uses: docker/bake-action@v6
+        uses: Warpbuilds/bake-action@v6
         with:
           source: "{{defaultContext}}:mysubdir"
           push: true
           set: |
             *.tags=user/app:latest
+          profile-name: super-fast-builder
 ```
 
 Building from the current repository automatically uses the `GITHUB_TOKEN`
@@ -119,7 +118,7 @@ on:
 
 jobs:
   bake:
-    runs-on: ubuntu-latest
+    runs-on: warp-ubuntu-latest-x64-4x
     steps:
       -
         name: Checkout
@@ -130,17 +129,15 @@ jobs:
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
-      -
-        name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
       -
         name: Build and push
-        uses: docker/bake-action@v6
+        uses: Warpbuilds/bake-action@v6
         with:
           source: .
           push: true
           set: |
             *.tags=user/app:latest
+          profile-name: super-fast-builder
 ```
 
 ## Summaries
@@ -214,6 +211,9 @@ The following inputs can be used as `step.with` keys
 | `set`          | List        | List of [targets values to override](https://docs.docker.com/engine/reference/commandline/buildx_bake/#set) (e.g., `targetpattern.key=value`)                      |
 | `targets`      | List/CSV    | List of bake targets (`default` target used if empty)                                                                                                              |
 | `github-token` | String      | API token used to authenticate to a Git repository for [remote definitions](https://docs.docker.com/build/bake/remote-definition/) (default `${{ github.token }}`) |
+| `profile-name` | String      | The profile name to use for the WarpBuild Docker Builders |
+| `api-key`      | String      | The API key for the WarpBuild API. This is not required in case of using WarpBuild runners |
+| `timeout`      | String      | The timeout(in ms) to wait for the Docker Builders to be ready. By default, it is 10 minutes |
 
 ### outputs
 

__tests__/Dockerfile

@@ -0,0 +1,28 @@
+ARG BUILD_TYPE=quick
+
+FROM ubuntu:22.04 as base
+RUN apt-get update && apt-get install -y \
+    curl \
+    && rm -rf /var/lib/apt/lists/*
+
+# Quick build stage
+FROM base as quick
+RUN echo "This is a quick build" > /build-info.txt
+
+# Heavy build stage
+FROM base as heavy
+# Simulate heavy build by installing more packages and running some commands
+RUN apt-get update && apt-get install -y \
+    build-essential \
+    python3 \
+    nodejs \
+    npm \
+    && rm -rf /var/lib/apt/lists/*
+RUN echo "This is a heavy build" > /build-info.txt
+# Simulate some heavy processing
+RUN dd if=/dev/zero of=/tmp/largefile bs=1M count=100
+RUN rm /tmp/largefile
+
+# Final stage
+FROM ${BUILD_TYPE}
+CMD ["cat", "/build-info.txt"] 

__tests__/bake.hcl

@@ -0,0 +1,35 @@
+variable "RUN_NUMBER" {
+  default = "1"
+}
+
+group "default" {
+  targets = ["quick-image", "heavy-image"]
+}
+
+target "quick-image" {
+  context = "__tests__"
+  dockerfile = "./Dockerfile"
+  tags = ["quick-image-run-${RUN_NUMBER}"]
+  platforms = ["linux/amd64"]
+  output = ["type=docker"]
+  profiles = ["dev-eph"]
+  args = {
+    BUILD_TYPE = "quick"
+  }
+}
+
+target "heavy-image" {
+  context = "__tests__"
+  dockerfile = "./Dockerfile"
+  tags = ["heavy-image-run-${RUN_NUMBER}"]
+  platforms = ["linux/amd64"]
+  output = ["type=docker"]
+  profiles = ["dev-eph"]
+  args = {
+    BUILD_TYPE = "heavy"
+  }
+  # Add more build steps or dependencies to make it take longer
+  contexts = {
+    quick-image = "target:quick-image"
+  }
+} 

action.yml

@@ -58,6 +58,17 @@ inputs:
     description: "API token used to authenticate to a Git repository for remote definitions"
     default: ${{ github.token }}
     required: false
+
+  api-key:
+    description: "The API key for the WarpBuild API. This is not required in case of using WarpBuild runners"
+    required: false
+  profile-name:
+    description: "The profile name to use for the WarpBuild Docker Builders"
+    required: true
+  timeout:
+    description: "The timeout(in ms) to wait for the Docker Builders to be ready. By default, it is 10 minutes"
+    required: false
+    default: "600000"
 
 outputs:
   metadata:

src/context.ts

@@ -1,14 +1,14 @@
 import * as core from '@actions/core';
 import * as handlebars from 'handlebars';
 
-import {Bake} from '@docker/actions-toolkit/lib/buildx/bake';
-import {Build} from '@docker/actions-toolkit/lib/buildx/build';
-import {Context} from '@docker/actions-toolkit/lib/context';
-import {GitHub} from '@docker/actions-toolkit/lib/github';
-import {Toolkit} from '@docker/actions-toolkit/lib/toolkit';
-import {Util} from '@docker/actions-toolkit/lib/util';
+import { Bake } from '@docker/actions-toolkit/lib/buildx/bake';
+import { Build } from '@docker/actions-toolkit/lib/buildx/build';
+import { Context } from '@docker/actions-toolkit/lib/context';
+import { GitHub } from '@docker/actions-toolkit/lib/github';
+import { Toolkit } from '@docker/actions-toolkit/lib/toolkit';
+import { Util } from '@docker/actions-toolkit/lib/util';
 
-import {BakeDefinition} from '@docker/actions-toolkit/lib/types/buildx/bake';
+import { BakeDefinition } from '@docker/actions-toolkit/lib/types/buildx/bake';
 
 export interface Inputs {
   builder: string;
@@ -26,6 +26,9 @@ export interface Inputs {
   set: string[];
   targets: string[];
   'github-token': string;
+  apiKey: string;
+  profileName: string;
+  timeout: string;
 }
 
 export async function getInputs(): Promise<Inputs> {
@@ -42,9 +45,12 @@ export async function getInputs(): Promise<Inputs> {
     provenance: Build.getProvenanceInput('provenance'),
     push: core.getBooleanInput('push'),
     sbom: core.getInput('sbom'),
-    set: Util.getInputList('set', {ignoreComma: true, quote: false}),
+    set: Util.getInputList('set', { ignoreComma: true, quote: false }),
     targets: Util.getInputList('targets'),
-    'github-token': core.getInput('github-token')
+    'github-token': core.getInput('github-token'),
+    apiKey: core.getInput('api-key'),
+    profileName: core.getInput('profile-name'),
+    timeout: core.getInput('timeout')
   };
 }
 

src/main.ts

@@ -19,6 +19,9 @@ import {UploadArtifactResponse} from '@docker/actions-toolkit/lib/types/github';
 
 import * as context from './context';
 import * as stateHelper from './state-helper';
+import {WarpBuildRemoteBuilders} from './warpbuild';
+
+let remoteBuilders: WarpBuildRemoteBuilders;
 
 actionsToolkit.run(
   // main
@@ -30,6 +33,17 @@ actionsToolkit.run(
     core.debug(`inputs: ${JSON.stringify(inputs)}`);
 
     const toolkit = new Toolkit();
+    const parsedTimeout = parseInt(inputs.timeout);
+    remoteBuilders = new WarpBuildRemoteBuilders({
+      apiKey: inputs.apiKey,
+      profileName: inputs.profileName,
+      timeout: parsedTimeout
+    });
+
+    // We don't need to wait for the builder assignment to complete here
+    // because the setupBuilders() method will wait for it if needed
+    remoteBuilders.assignBuilder();
+
     const gitAuthToken = process.env.BUILDX_BAKE_GIT_AUTH_TOKEN ?? inputs['github-token'];
 
     await core.group(`GitHub Actions runtime token ACs`, async () => {
@@ -85,6 +99,8 @@ actionsToolkit.run(
       await toolkit.buildx.printVersion();
     });
 
+    await remoteBuilders.setupBuilders();
+
     let builder: BuilderInfo;
     await core.group(`Builder info`, async () => {
       builder = await toolkit.builder.inspect(inputs.builder);
@@ -226,6 +242,10 @@ actionsToolkit.run(
     if (err) {
       throw err;
     }
+
+    if (remoteBuilders) {
+      remoteBuilders.saveState();
+    }
   },
   // post
   async () => {
@@ -272,6 +292,20 @@ actionsToolkit.run(
         fs.rmSync(stateHelper.tmpDir, {recursive: true});
       });
     }
+
+    const inputs: context.Inputs = await context.getInputs();
+    const parsedTimeout = parseInt(inputs.timeout);
+
+    remoteBuilders = new WarpBuildRemoteBuilders({
+      apiKey: inputs.apiKey,
+      profileName: inputs.profileName,
+      timeout: parsedTimeout
+    });
+
+    remoteBuilders.loadState();
+    await remoteBuilders.removeBuilderInstances();
+    await remoteBuilders.removeBuilderConfiguration();
+    await remoteBuilders.removeCertDirs();
   }
 );