Skip to content

Commit

Permalink
Merge pull request #41 from Michael-Gardner/hpcc-platform-9.10.x
Browse files Browse the repository at this point in the history
chore:  Squash commits for 9.10.0 gold release
  • Loading branch information
GordonSmith committed Aug 27, 2024
2 parents 1de2026 + 259d31d commit 6a9a155
Show file tree
Hide file tree
Showing 40 changed files with 1,998 additions and 0 deletions.
17 changes: 17 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
*

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

# Files
!.vcpkg-root
!bootstrap-vcpkg.sh
!LICENSE.txt
!shell.nix
!vcpkg-configuration.json
!vcpkg.json
110 changes: 110 additions & 0 deletions .github/workflows/prebuild-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
name: Refresh docker NuGet cache

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

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

workflow_dispatch:

jobs:
build-images:
strategy:
matrix:
image:
[
"ubuntu-24.04",
"ubuntu-22.04",
"ubuntu-20.04",
"rockylinux-8",
"centos-8",
]
fail-fast: false

name: "Docker: ${{ matrix.image }}"
runs-on: ubuntu-22.04
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)" >> $GITHUB_OUTPUT
echo "vcpkg_branch=$(echo $vcpkg_base_ref | cut -d'/' -f3)" >> $GITHUB_OUTPUT
echo "sha_short=$(git rev-parse --short=8 HEAD)" >> $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: |
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 }}
154 changes: 154 additions & 0 deletions .github/workflows/prebuild-gh_envs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,154 @@
name: Refresh GH environments NuGet cache

env:
VCPKG_BINARY_SOURCES: "clear;nuget,GitHub,readwrite"

on:
push:
branches:
- "hpcc-platform-9.10.x"

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

workflow_dispatch:

jobs:
build:
strategy:
matrix:
label:
[
"ubuntu-20.04-x64",
"ubuntu-22.04-x64",
"windows-2019-x64",
"windows-2022-x64",
"macos-12-x64",
"macos-13-x64"
]
include:
- label: "ubuntu-20.04-x64"
os: "ubuntu-20.04"
triplet: "x64-linux-dynamic"
mono: "mono"
sudo: "sudo"
- label: "ubuntu-22.04-x64"
os: "ubuntu-22.04"
triplet: "x64-linux-dynamic"
mono: "mono"
sudo: "sudo"
- label: "windows-2019-x64"
os: "windows-2019"
triplet: "x64-windows"
mono: ""
sudo: ""
- label: "windows-2022-x64"
os: "windows-2022"
triplet: "x64-windows"
mono: ""
sudo: ""
- label: "macos-12-x64"
os: "macos-12"
triplet: "x64-osx"
mono: "mono"
sudo: "sudo"
- label: "macos-13-x64"
os: "macos-13"
triplet: "x64-osx"
mono: "mono"
sudo: "sudo"
fail-fast: false

name: "GH Environment - ${{ matrix.label }}"
runs-on: ${{ matrix.os }}
steps:
- name: Ubuntu Dependencies
if: ${{ matrix.os == 'ubuntu-20.04' || matrix.os == 'ubuntu-22.04' }}
shell: "bash"
run: |
sudo apt-get update -y
sudo apt-get install -yq --no-install-recommends \
apt-transport-https \
autoconf \
autoconf-archive \
automake \
autotools-dev \
binutils-dev \
bison \
build-essential \
ca-certificates \
curl \
dirmngr \
flex \
git \
gnupg \
groff-base \
libtool \
pkg-config \
software-properties-common \
tar \
unzip \
uuid-dev \
zip
- name: Ubuntu Mono Dependencies
if: ${{ matrix.os == 'ubuntu-22.04' }}
shell: "bash"
run: |
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
echo "deb https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
sudo apt-get update -y
sudo apt-get -yq install -f mono-complete
- name: OSX Dependencies
if: ${{ matrix.os == 'macos-12' || matrix.os == 'macos-13' }}
shell: "bash"
run: |
brew install bison flex pkg-config automake libtool autoconf autoconf-archive coreutils
- name: Check out source code
uses: actions/checkout@v3
with:
fetch-depth: 0
ref: ${{ inputs.branch || github.ref }}

- name: "Bootstrap vcpkg"
working-directory: .
shell: "bash"
run: |
./bootstrap-vcpkg.sh
- name: "Setup NuGet Credentials"
working-directory: .
shell: "bash"
run: |
${{ matrix.mono }} `./vcpkg fetch nuget | tail -n 1` \
sources add \
-source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json" \
-storepasswordincleartext \
-name "GitHub" \
-username "${{ github.repository_owner }}" \
-password "${{ secrets.GITHUB_TOKEN }}"
${{ matrix.mono }} `./vcpkg fetch nuget | tail -n 1` \
setapikey "${{ secrets.GITHUB_TOKEN }}" \
-source "https://nuget.pkg.github.com/${{ github.repository_owner }}/index.json"
- name: "Update nuget (overlays)"
working-directory: .
shell: "bash"
run: |
./vcpkg install \
--x-abi-tools-use-exact-versions \
--host-triplet=${{ matrix.triplet }} \
--triplet=${{ matrix.triplet }}
- name: Upload error logs
if: ${{ failure() || cancelled() }}
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.os }}-logs
path: ./**/*.log
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@ __pycache__/
/installed*/
/vcpkg_installed*/
/packages/
/vcpkg_installed/
/scripts/buildsystems/tmp/
#ignore custom triplets
/triplets/*
Expand Down Expand Up @@ -322,3 +323,8 @@ prefab/
pythonenv3.8/
.venv/

###################
# hpcc
###################
.env
/vcpkg_*/
Loading

0 comments on commit 6a9a155

Please sign in to comment.