From f90967617bfa16eed47a462dfc1c49b796eb1f52 Mon Sep 17 00:00:00 2001 From: Pauline Ribeyre <4224001+paulineribeyre@users.noreply.github.com> Date: Fri, 31 Jan 2025 14:07:06 -0600 Subject: [PATCH] clean up --- .../workflows/all-builds.yml | 22 ++++++------- .../workflows/build-all-dockers.yml | 0 .../workflows/build-docker.yml | 0 .../workflows/build-macos-binaries.yml | 0 .../workflows/build-macos-package.yml | 0 .../workflows/build-stone-wasm.yml | 0 .../workflows/build-volview-dist.yml | 0 .../workflows/build-win-binaries.yml | 0 .../workflows/build-windows-installer.yml | 0 .../{civ2.yml => gen3-build-orthanc.yml} | 33 +------------------ .../workflows/pre-build.yml | 0 backup_.github/buildkitd.toml | 2 -- docker/orthanc/build-or-download.sh | 1 + local-build.sh | 4 +-- 14 files changed, 15 insertions(+), 47 deletions(-) rename {backup_.github => .github}/workflows/all-builds.yml (97%) rename {backup_.github => .github}/workflows/build-all-dockers.yml (100%) rename {backup_.github => .github}/workflows/build-docker.yml (100%) rename {backup_.github => .github}/workflows/build-macos-binaries.yml (100%) rename {backup_.github => .github}/workflows/build-macos-package.yml (100%) rename {backup_.github => .github}/workflows/build-stone-wasm.yml (100%) rename {backup_.github => .github}/workflows/build-volview-dist.yml (100%) rename {backup_.github => .github}/workflows/build-win-binaries.yml (100%) rename {backup_.github => .github}/workflows/build-windows-installer.yml (100%) rename .github/workflows/{civ2.yml => gen3-build-orthanc.yml} (54%) rename {backup_.github => .github}/workflows/pre-build.yml (100%) delete mode 100644 backup_.github/buildkitd.toml diff --git a/backup_.github/workflows/all-builds.yml b/.github/workflows/all-builds.yml similarity index 97% rename from backup_.github/workflows/all-builds.yml rename to .github/workflows/all-builds.yml index 4c32c150..c4fdcda1 100644 --- a/backup_.github/workflows/all-builds.yml +++ b/.github/workflows/all-builds.yml @@ -1,16 +1,16 @@ name: all-builds -on: - schedule: - - cron: "0 23 * * *" - push: - branches: - - '*' - tags: - - '*' - - pull_request: - branches: [ master ] +on: workflow_dispatch + # schedule: + # - cron: "0 23 * * *" + # push: + # branches: + # - '*' + # tags: + # - '*' + + # pull_request: + # branches: [ master ] jobs: diff --git a/backup_.github/workflows/build-all-dockers.yml b/.github/workflows/build-all-dockers.yml similarity index 100% rename from backup_.github/workflows/build-all-dockers.yml rename to .github/workflows/build-all-dockers.yml diff --git a/backup_.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml similarity index 100% rename from backup_.github/workflows/build-docker.yml rename to .github/workflows/build-docker.yml diff --git a/backup_.github/workflows/build-macos-binaries.yml b/.github/workflows/build-macos-binaries.yml similarity index 100% rename from backup_.github/workflows/build-macos-binaries.yml rename to .github/workflows/build-macos-binaries.yml diff --git a/backup_.github/workflows/build-macos-package.yml b/.github/workflows/build-macos-package.yml similarity index 100% rename from backup_.github/workflows/build-macos-package.yml rename to .github/workflows/build-macos-package.yml diff --git a/backup_.github/workflows/build-stone-wasm.yml b/.github/workflows/build-stone-wasm.yml similarity index 100% rename from backup_.github/workflows/build-stone-wasm.yml rename to .github/workflows/build-stone-wasm.yml diff --git a/backup_.github/workflows/build-volview-dist.yml b/.github/workflows/build-volview-dist.yml similarity index 100% rename from backup_.github/workflows/build-volview-dist.yml rename to .github/workflows/build-volview-dist.yml diff --git a/backup_.github/workflows/build-win-binaries.yml b/.github/workflows/build-win-binaries.yml similarity index 100% rename from backup_.github/workflows/build-win-binaries.yml rename to .github/workflows/build-win-binaries.yml diff --git a/backup_.github/workflows/build-windows-installer.yml b/.github/workflows/build-windows-installer.yml similarity index 100% rename from backup_.github/workflows/build-windows-installer.yml rename to .github/workflows/build-windows-installer.yml diff --git a/.github/workflows/civ2.yml b/.github/workflows/gen3-build-orthanc.yml similarity index 54% rename from .github/workflows/civ2.yml rename to .github/workflows/gen3-build-orthanc.yml index 9673ae71..e9795543 100644 --- a/.github/workflows/civ2.yml +++ b/.github/workflows/gen3-build-orthanc.yml @@ -51,41 +51,10 @@ jobs: with: images: | quay.io/cdis/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }} - # ${{ inputs.AWS_ECR_REGISTRY }}/gen3/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }} - - # - name: Build and push - # if: ${{ !inputs.USE_QUAY_ONLY }} - # uses: docker/build-push-action@v6 - # # You may get ECR-push errors when first adding the workflow to a github repo. - # # If so, run the following in dev/qa to create the ECR repository: - # # qaplanetv1@cdistest_dev_admin:~$ aws ecr create-repository --repository-name "gen3/" --image-scanning-configuration scanOnPush=true - # with: - # context: ${{ inputs.DOCKERFILE_BUILD_CONTEXT }} - # file: ${{ inputs.DOCKERFILE_LOCATION }} - # push: true - # tags: | - # ${{ inputs.AWS_ECR_REGISTRY }}/gen3/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }} - # quay.io/cdis/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }} - # labels: ${{ steps.meta.outputs.labels }} - # cache-from: type=registry,ref=${{ inputs.AWS_ECR_REGISTRY }}/gen3/${{ env.REPO_NAME }}:cache - # cache-to: type=registry,ref=${{ inputs.AWS_ECR_REGISTRY }}/gen3/${{ env.REPO_NAME }}:cache,mode=max,image-manifest=true,oci-mediatypes=true - # platforms: ${{ inputs.BUILD_PLATFORMS }} - - # - name: Build and push (Quay only) - # if: ${{ inputs.USE_QUAY_ONLY }} - # uses: docker/build-push-action@v6 - # with: - # context: ${{ inputs.DOCKERFILE_BUILD_CONTEXT }} - # file: ${{ inputs.DOCKERFILE_LOCATION }} - # push: true - # tags: | - # quay.io/cdis/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }} - # labels: ${{ steps.meta.outputs.labels }} - # platforms: ${{ inputs.BUILD_PLATFORMS }} + ${{ inputs.AWS_ECR_REGISTRY }}/gen3/${{ env.REPO_NAME }}:${{ env.IMAGE_TAG }} # TODO linux/arm64 image - name: Build linux/amd64 image - # TODO add image name run: ./local-build.sh version=stable platform=linux/amd64 image=normal type=ci step=build currentTag=${{ env.IMAGE_TAG }} - name: Push linux/amd64 image diff --git a/backup_.github/workflows/pre-build.yml b/.github/workflows/pre-build.yml similarity index 100% rename from backup_.github/workflows/pre-build.yml rename to .github/workflows/pre-build.yml diff --git a/backup_.github/buildkitd.toml b/backup_.github/buildkitd.toml deleted file mode 100644 index 531aab30..00000000 --- a/backup_.github/buildkitd.toml +++ /dev/null @@ -1,2 +0,0 @@ -[worker.oci] - max-parallelism = 4 \ No newline at end of file diff --git a/docker/orthanc/build-or-download.sh b/docker/orthanc/build-or-download.sh index 5b4bd0be..4ac397a8 100755 --- a/docker/orthanc/build-or-download.sh +++ b/docker/orthanc/build-or-download.sh @@ -97,6 +97,7 @@ if [[ $target == "orthanc" ]]; then # also force latest OpenSSL (and therefore, we need to force static libcurl) cmake -DALLOW_DOWNLOADS=ON -DCMAKE_BUILD_TYPE:STRING=Release -DSTANDALONE_BUILD=ON -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON -DUSE_SYSTEM_CIVETWEB=OFF -DUSE_SYSTEM_DCMTK=OFF -DUSE_SYSTEM_OPENSSL=OFF -DUSE_SYSTEM_CURL=OFF $sourcesRootPath/OrthancServer make -j 4 + # HttpClient.Ssl and HttpClient.SslNoVerification are failing # $buildRootPath/UnitTests upload Orthanc diff --git a/local-build.sh b/local-build.sh index 570728c7..391686e2 100755 --- a/local-build.sh +++ b/local-build.sh @@ -231,7 +231,7 @@ fi add_host_cmd=--add-host=orthanc.uclouvain.be:130.104.229.21 -# ###### runner-base +###### runner-base # docker $build \ # $add_host_cmd \ # --progress=plain --platform=$platform -t orthancteam/orthanc-runner-base:$BASE_BUILDER_IMAGE_TAG \ @@ -241,7 +241,7 @@ add_host_cmd=--add-host=orthanc.uclouvain.be:130.104.229.21 # $push_load_arg_builder_image \ # -f docker/orthanc/Dockerfile.runner-base docker/orthanc -# ###### builder-base +###### builder-base # docker $build \ # $add_host_cmd \ # --progress=plain --platform=$platform -t orthancteam/orthanc-builder-base:$BASE_BUILDER_IMAGE_TAG \