Skip to content

Commit

Permalink
Merge branch 'ponylang:main' into emac
Browse files Browse the repository at this point in the history
  • Loading branch information
sblessing authored Sep 1, 2023
2 parents f23ac57 + 8cd4f6d commit d31e31e
Show file tree
Hide file tree
Showing 79 changed files with 1,834 additions and 1,416 deletions.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion .ci-dockerfiles/cross-aarch64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20230115
FROM ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20230830

ARG CROSS_TRIPLE=aarch64-unknown-linux-gnu
ARG CROSS_CC=aarch64-linux-gnu-gcc
Expand Down
4 changes: 2 additions & 2 deletions .ci-dockerfiles/cross-aarch64/build-and-push.bash
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ set -o errexit
set -o nounset

#
# *** You should already be logged in to DockerHub when you run this ***
# *** You should already be logged in to GHCR when you run this ***
#

NAME="ponylang/ponyc-ci-cross-aarch64"
NAME="ghcr.io/ponylang/ponyc-ci-cross-aarch64"
TODAY=$(date +%Y%m%d)
DOCKERFILE_DIR="$(dirname "$0")"

Expand Down
2 changes: 1 addition & 1 deletion .ci-dockerfiles/cross-arm/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20230115
FROM ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20230830

ARG CROSS_TRIPLE=arm-unknown-linux-gnueabi
ARG CROSS_CC=arm-linux-gnueabi-gcc
Expand Down
4 changes: 2 additions & 2 deletions .ci-dockerfiles/cross-arm/build-and-push.bash
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ set -o errexit
set -o nounset

#
# *** You should already be logged in to DockerHub when you run this ***
# *** You should already be logged in to GHCR when you run this ***
#

NAME="ponylang/ponyc-ci-cross-arm"
NAME="ghcr.io/ponylang/ponyc-ci-cross-arm"
TODAY=$(date +%Y%m%d)
DOCKERFILE_DIR="$(dirname "$0")"

Expand Down
2 changes: 1 addition & 1 deletion .ci-dockerfiles/cross-armhf/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20230115
FROM ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20230830

ARG CROSS_TRIPLE=arm-unknown-linux-gnueabihf
ARG CROSS_CC=arm-linux-gnueabihf-gcc
Expand Down
4 changes: 2 additions & 2 deletions .ci-dockerfiles/cross-armhf/build-and-push.bash
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ set -o errexit
set -o nounset

#
# *** You should already be logged in to DockerHub when you run this ***
# *** You should already be logged in to GHCR when you run this ***
#

NAME="ponylang/ponyc-ci-cross-armhf"
NAME="ghcr.io/ponylang/ponyc-ci-cross-armhf"
TODAY=$(date +%Y%m%d)
DOCKERFILE_DIR="$(dirname "$0")"

Expand Down
2 changes: 1 addition & 1 deletion .ci-dockerfiles/cross-riscv64/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20230115
FROM ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder:20230830

USER root

Expand Down
4 changes: 2 additions & 2 deletions .ci-dockerfiles/cross-riscv64/build-and-push.bash
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ set -o errexit
set -o nounset

#
# *** You should already be logged in to DockerHub when you run this ***
# *** You should already be logged in to GHCR when you run this ***
#

NAME="ponylang/ponyc-ci-cross-riscv64"
NAME="ghcr.io/ponylang/ponyc-ci-cross-riscv64"
TODAY=$(date +%Y%m%d)
DOCKERFILE_DIR="$(dirname "$0")"

Expand Down
14 changes: 0 additions & 14 deletions .ci-dockerfiles/x86-64-pc-windows-msvc-builder/Dockerfile

This file was deleted.

5 changes: 0 additions & 5 deletions .ci-dockerfiles/x86-64-pc-windows-msvc-builder/README.md

This file was deleted.

This file was deleted.

7 changes: 3 additions & 4 deletions .ci-dockerfiles/x86-64-unknown-linux-musl-builder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM alpine:3.16
FROM alpine:3.18


RUN apk update \
&& apk upgrade \
Expand All @@ -7,8 +8,6 @@ RUN apk update \
binutils-gold \
clang \
clang-dev \
libexecinfo-dev \
libexecinfo-static \
coreutils \
linux-headers \
cmake \
Expand All @@ -21,6 +20,6 @@ RUN apk update \
&& pip install cloudsmith-cli

# add user pony in order to not run tests as root
RUN adduser -D -s /bin/sh -h /home/pony -g root pony
RUN adduser -D -u 1001 -s /bin/sh -h /home/pony -g root pony
USER pony
WORKDIR /home/pony
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ set -o errexit
set -o nounset

#
# *** You should already be logged in to DockerHub when you run this ***
# *** You should already be logged in to GHCR when you run this ***
#

TODAY=$(date +%Y%m%d)
DOCKERFILE_DIR="$(dirname "$0")"

docker build --pull -t "ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:${TODAY}" \
docker build --pull -t "ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:${TODAY}" \
"${DOCKERFILE_DIR}"
docker push "ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:${TODAY}"
docker push "ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-musl-builder:${TODAY}"
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ RUN curl --output cmake-3.25.1-linux-x86_64.sh https://cmake.org/files/v3.25/cma
&& sh cmake-3.25.1-linux-x86_64.sh --prefix=/usr/local --exclude-subdir

# add user pony in order to not run tests as root
RUN useradd -ms /bin/bash -d /home/pony -g root pony
RUN useradd -u 1001 -ms /bin/bash -d /home/pony -g root pony
USER pony
WORKDIR /home/pony
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ set -o errexit
set -o nounset

#
# *** You should already be logged in to DockerHub when you run this ***
# *** You should already be logged in to GHCR when you run this ***
#

NAME="ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder"
NAME="ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu20.04-builder"
TODAY=$(date +%Y%m%d)
DOCKERFILE_DIR="$(dirname "$0")"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,26 @@ RUN apt-get update \
zlib1g-dev \
curl \
python3-pip \
lldb \
wget \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get -y autoremove --purge \
&& apt-get -y clean \
&& pip3 install cloudsmith-cli

## lldb-14 is buggy, we need to get 17.
RUN echo "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-17 main" >> /etc/apt/sources.list \
&& wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc \
&& apt-get update \
&& apt-get install -y --no-install-recommends lldb-17 \
&& rm -rf /var/lib/apt/lists/* \
&& apt-get -y autoremove --purge \
&& apt-get -y clean \
&& ln -s /usr/lib/llvm-17/bin/lldb /usr/bin

# needed for GitHub actions
RUN git config --global --add safe.directory /__w/ponyc/ponyc

# add user pony in order to not run tests as root
RUN useradd -ms /bin/bash -d /home/pony -g root pony
RUN useradd -u 1001 -ms /bin/bash -d /home/pony -g root pony
USER pony
WORKDIR /home/pony
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ set -o errexit
set -o nounset

#
# *** You should already be logged in to DockerHub when you run this ***
# *** You should already be logged in to GHCR when you run this ***
#

NAME="ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu22.04-builder"
NAME="ghcr.io/ponylang/ponyc-ci-x86-64-unknown-linux-ubuntu22.04-builder"
TODAY=$(date +%Y%m%d)
DOCKERFILE_DIR="$(dirname "$0")"

Expand Down
61 changes: 0 additions & 61 deletions .ci-scripts/x86-64-unknown-freebsd-13.1-nightly.bash

This file was deleted.

Loading

0 comments on commit d31e31e

Please sign in to comment.