Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/candidate-9.6.x' into candidate-…
Browse files Browse the repository at this point in the history
…9.8.x

Signed-off-by: Gordon Smith <[email protected]>

# Conflicts:
#	helm/hpcc/Chart.yaml
#	helm/hpcc/templates/_helpers.tpl
#	version.cmake
  • Loading branch information
GordonSmith committed Sep 6, 2024
2 parents 359d457 + a4a96d5 commit d3e11a7
Showing 1 changed file with 0 additions and 2 deletions.
2 changes: 0 additions & 2 deletions dockerfiles/platform-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,6 @@ RUN git clone --no-checkout https://github.com/${BUILD_USER}/HPCC-Platform.git &

WORKDIR /hpcc-dev/HPCC-Platform/vcpkg
RUN ./bootstrap-vcpkg.sh
ARG GITHUB_ACTOR=hpcc-systems
ARG GITHUB_TOKEN=none

WORKDIR /hpcc-dev/build

Expand Down

0 comments on commit d3e11a7

Please sign in to comment.