Skip to content

Commit

Permalink
chore: Squash for 8.10.x
Browse files Browse the repository at this point in the history
This branch is the same as hpcc-platform-8.8.x but rebased onto 2024.02.14
The port versions are the same as 8.8.x, but the build tools are from 2024.02.14
This is needed as 8.8.x is failing to build on windows

Signed-off-by: Gordon Smith <[email protected]>
  • Loading branch information
GordonSmith committed Feb 29, 2024
1 parent fba75d0 commit 6ac4f06
Show file tree
Hide file tree
Showing 76 changed files with 5,423 additions and 176 deletions.
50 changes: 50 additions & 0 deletions .github/workflows/prebuild-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Refresh docker NuGet cache

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

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

workflow_dispatch:

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

name: "Docker: ${{ matrix.image }}"
runs-on: ubuntu-latest
steps:
- name: Check out source code
uses: actions/checkout@v3
with:
ref: ${{ inputs.branch || github.ref }}

- name: "Build dockerfile"
shell: "bash"
run: |
GITHUB_REF=$(git ls-remote https://github.com/${{ github.actor }}/vcpkg ${{ inputs.branch || github.ref }} | cut -f 1)
docker build --pull --rm -f "dockerfiles/${{ matrix.image }}.dockerfile" -t vcpkg-${{ matrix.image }}:$GITHUB_REF \
--build-arg GITHUB_OWNER=${{ github.actor }} \
--build-arg GITHUB_REF=$GITHUB_REF \
--build-arg GITHUB_ACTOR=${{ github.actor }} \
--build-arg GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }} \
"./dockerfiles"
152 changes: 152 additions & 0 deletions .github/workflows/prebuild-gh_envs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,152 @@
name: Refresh GH environments NuGet cache

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

on:
push:
branches:
- "hpcc-platform-8.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-2019-x86",
"windows-2022-x64",
"windows-2022-x86",
"macos-11-x64",
"macos-12-x64",
]
include:
- label: "ubuntu-20.04-x64"
os: "ubuntu-20.04"
triplet: "x64-linux"
mono: "mono"
sudo: "sudo"
- label: "ubuntu-22.04-x64"
os: "ubuntu-22.04"
triplet: "x64-linux"
mono: "mono"
sudo: "sudo"
- label: "windows-2019-x64"
os: "windows-2019"
triplet: "x64-windows"
mono: ""
sudo: ""
- label: "windows-2019-x86"
os: "windows-2019"
triplet: "x86-windows"
mono: ""
sudo: ""
- label: "windows-2022-x64"
os: "windows-2022"
triplet: "x64-windows"
mono: ""
sudo: ""
- label: "windows-2022-x86"
os: "windows-2022"
triplet: "x86-windows"
mono: ""
sudo: ""
- label: "macos-11-x64"
os: "macos-11"
triplet: "x64-osx"
mono: "mono"
sudo: "sudo"
- label: "macos-12-x64"
os: "macos-12"
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 \
automake \
autotools-dev \
binutils-dev \
build-essential \
libtool \
pkg-config
- 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-11' || matrix.os == 'macos-12'}}
shell: "bash"
run: |
brew install pkg-config automake libtool
- name: "Remove builtin vcpkg (old)"
working-directory: .
shell: "bash"
run: |
${{ matrix.sudo }} rm -rf "$VCPKG_INSTALLATION_ROOT"
- 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)"
shell: "bash"
run: |
./vcpkg install --x-abi-tools-use-exact-versions --overlay-ports=./overlays --triplet ${{ matrix.triplet }}
- name: Upload error logs
if: ${{ failure() || cancelled() }}
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.os }}-logs
path: ./**/*.log
171 changes: 0 additions & 171 deletions .github/workflows/untrustedPR.yml

This file was deleted.

Loading

0 comments on commit 6ac4f06

Please sign in to comment.