Skip to content

Commit

Permalink
feat: Bump to latest vcpkg 2025-02-14
Browse files Browse the repository at this point in the history
Add support for osx-14-arm
Add support for linux arm

Signed-off-by: Gordon Smith <[email protected]>
  • Loading branch information
GordonSmith committed Feb 21, 2025
1 parent d5ec528 commit 3020b13
Show file tree
Hide file tree
Showing 47 changed files with 1,883 additions and 361 deletions.
18 changes: 18 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
*

# Folders
!overlays
!ports
!scripts
!toolsrc
!triplets
!version

# Files
!.vcpkg-root
!bootstrap-vcpkg.sh
!LICENSE.txt
!shell.nix
!vcpkg-configuration.json
!vcpkg.json
!dockerfiles/CentOS-Base.repo
31 changes: 0 additions & 31 deletions .github/pull_request_template.md

This file was deleted.

84 changes: 0 additions & 84 deletions .github/workflows/check_issues.yml

This file was deleted.

133 changes: 133 additions & 0 deletions .github/workflows/prebuild-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
name: Refresh docker NuGet cache

on:
push:
tags:
- "*"
branches:
- "hpcc-platform-9.12.x"

workflow_call:
inputs:
branch:
description: "The branch to build"
required: true
type: string

workflow_dispatch:

jobs:
build-images:
strategy:
matrix:
include:
- image: "ubuntu-24.04"
triplet: "arm64-linux-dynamic"
base_image: "arm64v8/ubuntu:24.04"
tag_postfix: "-arm"
- image: "ubuntu-24.04"
triplet: "x64-linux-dynamic"
base_image: "ubuntu:24.04"
tag_postfix: ""
- image: "ubuntu-22.04"
triplet: "arm64-linux-dynamic"
base_image: "arm64v8/ubuntu:22.04"
tag_postfix: "-arm"
- image: "ubuntu-22.04"
triplet: "x64-linux-dynamic"
base_image: "ubuntu:22.04"
tag_postfix: ""
- image: "ubuntu-20.04"
triplet: "x64-linux-dynamic"
base_image: ""
tag_postfix: ""
- image: "rockylinux-8"
triplet: "x64-linux-dynamic"
base_image: ""
tag_postfix: ""
- image: "centos-7"
triplet: "x64-linux-dynamic"
base_image: ""
tag_postfix: ""
fail-fast: false

name: "Docker: ${{ matrix.image }}-${{ matrix.triplet }}"
runs-on: ${{ matrix.triplet == 'x64-linux-dynamic' && 'ubuntu-22.04' || 'ubuntu-22.04-arm' }}
steps:
- name: Free additional disk space (remove Android SDK + Tools)
continue-on-error: true
run: |
df -h
sudo rm -rf /usr/local/lib/android
sudo rm -rf ${JAVA_HOME_8_X64}
sudo rm -rf ${JAVA_HOME_11_X64}
sudo rm -rf ${JAVA_HOME_17_X64}
sudo rm -rf ${JAVA_HOME_21_X64}
sudo rm -rf ${CHROMEWEBDRIVER}
sudo rm -rf ${EDGEWEBDRIVER}
sudo rm -rf ${GECKOWEBDRIVER}
sudo rm -rf ${SELENIUM_JAR_PATH}
sudo rm -rf /usr/share/dotnet
sudo rm -rf /opt/ghc
sudo rm -rf "/usr/local/share/boost"
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
- name: Display disk space (post free)
run: |
df -h
- name: Check out source code
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ inputs.branch || github.ref }}

- name: Calculate vars
id: vars
run: |
vcpkg_ref=${{ inputs.branch || github.ref }}
vcpkg_base_ref=${{ inputs.branch || github.event.base_ref || github.ref }}
echo "vcpkg_ref=$vcpkg_ref" >> $GITHUB_OUTPUT
echo "vcpkg_tag=$(echo $vcpkg_ref | cut -d'/' -f3)${{ matrix.tag_postfix }}" >> $GITHUB_OUTPUT
echo "vcpkg_branch=$(echo $vcpkg_base_ref | cut -d'/' -f3)" >> $GITHUB_OUTPUT
echo "sha_short=$(git rev-parse --short=8 HEAD)${{ matrix.tag_postfix }}" >> $GITHUB_OUTPUT
echo "repository_owner=${{ github.repository_owner }}" >> $GITHUB_OUTPUT
- name: Print vars
run: |
echo "${{ toJSON(steps.vars.outputs) }})"
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3

- name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Pull previous images
run: |
docker pull hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.sha_short }} || true
docker pull hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.vcpkg_tag }} || true
- name: Build ${{ matrix.os }} image
uses: docker/build-push-action@v5
with:
builder: ${{ steps.buildx.outputs.name }}
file: dockerfiles/${{ matrix.image }}.dockerfile
context: .
push: ${{ steps.vars.outputs.repository_owner == 'hpcc-systems' }}
build-args: |
BASE_IMAGE=${{ matrix.base_image }}
TRIPLET=${{ matrix.triplet }}
NUGET_MODE=readwrite
GITHUB_ACTOR=${{ github.repository_owner }}
GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
tags: |
hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.sha_short }}
hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.vcpkg_tag }}
cache-from: |
type=registry,ref=hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.sha_short }}
type=registry,ref=hpccsystems/platform-build-base-${{ matrix.image }}:${{ steps.vars.outputs.vcpkg_tag }}
Loading

0 comments on commit 3020b13

Please sign in to comment.