Skip to content

Commit

Permalink
fix: CI/CD on PRs
Browse files Browse the repository at this point in the history
  • Loading branch information
aleortega committed Mar 8, 2024
1 parent 970855b commit f0790f1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
12 changes: 4 additions & 8 deletions .github/workflows/build-docker.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
name: Manual CI/CD on PRs
name: CI/CD on PRs

on:
pull_request:
workflow_dispatch:
inputs:
branch_name:
description: 'The name of the branch to build from'
required: true
types: [ready_for_review]

jobs:
build:
Expand Down Expand Up @@ -42,5 +38,5 @@ jobs:
- name: Build and push
id: docker_build
run: |
docker build --no-cache --build-arg COMMIT_HASH=${{ steps.get_commit_sha.outputs.sha }} --build-arg VULKAN_DLL_PATH=./vulkan-sdt/1.3.268.0/runtime/x64/vulkan-1.dll -t quay.io/decentraland/lods-generator:${{ steps.get_commit_sha.outputs.sha }} .
docker push quay.io/decentraland/lods-generator:${{ steps.get_commit_sha.outputs.sha }}
docker build --no-cache --build-arg COMMIT_HASH=${{ github.sha }} --build-arg VULKAN_DLL_PATH=./vulkan-sdt/1.3.268.0/runtime/x64/vulkan-1.dll -t quay.io/decentraland/lods-generator:${{ github.sha }} .
docker push quay.io/decentraland/lods-generator:${{ github.sha }}
1 change: 0 additions & 1 deletion consumer-server/src/utils/timer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ export async function timeout(ms: number, message: string) {
return new Promise<never>((_, reject) => setTimeout(() => reject(new Error(message)), ms))
}

// test change
export async function sleep(ms: number) {
return new Promise<void>((ok) => setTimeout(ok, ms))
}

0 comments on commit f0790f1

Please sign in to comment.