Skip to content

Commit 8ca053b

Browse files
lloekilloeki
committed
Merge remote-tracking branch 'origin/main' into lloeki/split-compiler
2 parents a975133 + ff017a9 commit 8ca053b

60 files changed

Lines changed: 142 additions & 143 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/dependabot.yml.disabled renamed to .github/dependabot.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ updates:
1313
gh-actions-packages:
1414
patterns:
1515
- "*"
16+
cooldown:
17+
default-days: 2

‎.github/workflows/_build-image.yml‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
tags: ${{ steps.aliases.outputs.tags }}
4747
steps:
4848
- name: Checkout
49-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
49+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1
5050
with:
5151
persist-credentials: false
5252

@@ -93,7 +93,7 @@ jobs:
9393
name: Build (${{ inputs.engine }}:${{ inputs.version }}-${{ inputs.libc }}${{ inputs.tag_suffix }}, ${{ matrix.arch }})
9494
steps:
9595
- name: Set up Docker
96-
uses: crazy-max/ghaction-setup-docker@3fb92d6d9c634363128c8cce4bc3b2826526370a
96+
uses: crazy-max/ghaction-setup-docker@77e84dbf09b47d1e29270283c22f16145aa85ca1 # v5.4.0
9797
with:
9898
version: v28.5.1
9999
daemon-config: |
@@ -104,7 +104,7 @@ jobs:
104104
}
105105
106106
- name: Checkout
107-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
107+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
108108
with:
109109
persist-credentials: false
110110
fetch-depth: 20
@@ -266,7 +266,7 @@ jobs:
266266
name: Join (${{ inputs.engine }}:${{ inputs.version }}-${{ inputs.libc }}${{ inputs.tag_suffix }}) [${{ join(fromJSON(inputs.arch), ', ') }}]
267267
steps:
268268
- name: Set up Docker
269-
uses: crazy-max/ghaction-setup-docker@3fb92d6d9c634363128c8cce4bc3b2826526370a
269+
uses: crazy-max/ghaction-setup-docker@77e84dbf09b47d1e29270283c22f16145aa85ca1 # v5.4.0
270270
with:
271271
version: v28.5.1
272272

@@ -317,12 +317,19 @@ jobs:
317317
${{ steps.vars.outputs.IMAGE }}:${{ steps.vars.outputs.RUNID_TAG }}
318318
319319
- name: Create and push multiarch manifest aliases
320-
if: ${{ inputs.push }}
321320
env:
322321
ALIAS_TAGS: ${{ needs.alias.outputs.tags }}
323322
run: |
324323
while IFS= read -r tag; do
325324
docker buildx imagetools create \
326-
-t ${{ steps.vars.outputs.IMAGE }}:"$tag" \
325+
-t ${{ steps.vars.outputs.IMAGE }}:"$tag-gha${{ github.run_id }}-g${{ github.sha }}" \
326+
${{ steps.vars.outputs.IMAGE }}:${{ steps.vars.outputs.RUNID_TAG }}
327+
docker buildx imagetools create \
328+
-t ${{ steps.vars.outputs.IMAGE }}:"$tag-g${{ github.sha }}" \
327329
${{ steps.vars.outputs.IMAGE }}:${{ steps.vars.outputs.RUNID_TAG }}
330+
if [ "${{ inputs.push }}" = true ]; then
331+
docker buildx imagetools create \
332+
-t ${{ steps.vars.outputs.IMAGE }}:"$tag" \
333+
${{ steps.vars.outputs.IMAGE }}:${{ steps.vars.outputs.RUNID_TAG }}
334+
fi
328335
done < <(jq -r '.[]' <<< "$ALIAS_TAGS")

‎.github/workflows/nix.yml‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,15 @@ jobs:
1212
- os: darwin
1313
cpu: x86_64
1414
base: macos-15-intel # always x86_64-darwin
15-
nix-installer:
16-
platform: x86_64-darwin
1715
- os: darwin
1816
cpu: arm64
1917
base: macos-15 # always arm64-darwin
20-
nix-installer:
21-
platform: aarch64-darwin
2218
- os: linux
2319
cpu: x86_64
2420
base: ubuntu-24.04 # always x86_64-linux-gnu
25-
nix-installer:
26-
platform: x86_64-linux
2721
- os: linux
2822
cpu: aarch64
2923
base: arm-4core-linux-ubuntu24.04 # always aarch64-linux-gnu
30-
nix-installer:
31-
platform: aarch64-linux
3224

3325
name: Test Nix (${{ matrix.platform.cpu }}-${{ matrix.platform.os }})
3426
runs-on: ${{ matrix.platform.base }}
@@ -41,12 +33,10 @@ jobs:
4133
- name: Check CPU arch
4234
run: |
4335
test "$(uname -m)" = "${{ matrix.platform.cpu }}"
44-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
36+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4537
with:
4638
persist-credentials: false
47-
- uses: DeterminateSystems/nix-installer-action@786fff0690178f1234e4e1fe9b536e94f5433196
48-
with:
49-
source-url: https://github.com/DeterminateSystems/nix-installer/releases/download/v0.30.0/nix-installer-${{ matrix.platform.nix-installer.platform }}
39+
- uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0
5040
- name: Print Nix version
5141
run: |
5242
nix --version

‎.github/workflows/services.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
name: Build (${{ matrix.service }})
4747
steps:
4848
- name: Set up Docker
49-
uses: crazy-max/ghaction-setup-docker@3fb92d6d9c634363128c8cce4bc3b2826526370a
49+
uses: crazy-max/ghaction-setup-docker@77e84dbf09b47d1e29270283c22f16145aa85ca1 # v5.4.0
5050
with:
5151
version: v28.5.1
5252
daemon-config: |
@@ -56,11 +56,11 @@ jobs:
5656
}
5757
}
5858
- name: Set up Ruby
59-
uses: ruby/setup-ruby@d5126b9b3579e429dd52e51e68624dda2e05be25
59+
uses: ruby/setup-ruby@95ef2b042f9d7a56d8268cba8559e2842e2ad01b # v1.321.0
6060
with:
6161
ruby-version: "3.4"
6262
- name: Checkout
63-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
63+
uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
6464
with:
6565
persist-credentials: false
6666
fetch-depth: 2

‎src/engines/jruby/10.0/Dockerfile.gnu‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,32 +38,32 @@ RUN true "${REPRO_RUN_KEY}" && apt-get update
3838
RUN apt-get install -y libc6-dev build-essential git locales tzdata curl --no-install-recommends && rm -rf /var/lib/apt/lists/*
3939

4040
# Ensure sane locale (`eclipse-temurin` already updated `/etc/locale.gen` for `en_US.UTF-8`)
41-
ENV LANG en_US.UTF-8
42-
ENV LANGUAGE en_US:en
41+
ENV LANG=en_US.UTF-8
42+
ENV LANGUAGE=en_US:en
4343

4444
# Ensure consistent timezone
4545
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
4646

4747
# Install JRuby, pinned for reproducibility
48-
ENV JRUBY_VERSION 10.0.2.0
49-
ENV JRUBY_SHA256 b8a026f38aa98461a04ed0aa0b20891ce257ecbe53e124719ce9ee5b804525f1
48+
ENV JRUBY_VERSION=10.0.2.0
49+
ENV JRUBY_SHA256=b8a026f38aa98461a04ed0aa0b20891ce257ecbe53e124719ce9ee5b804525f1
5050
RUN mkdir /opt/jruby \
5151
&& curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
5252
&& echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \
5353
&& tar -zx --strip-components=1 -f /tmp/jruby.tar.gz -C /opt/jruby \
5454
&& rm /tmp/jruby.tar.gz \
5555
&& update-alternatives --install /usr/local/bin/ruby ruby /opt/jruby/bin/jruby 1
56-
ENV PATH /opt/jruby/bin:$PATH
56+
ENV PATH=/opt/jruby/bin:$PATH
5757

5858
# Skip installing gem documentation
5959
RUN mkdir -p /opt/jruby/etc \
6060
&& echo -e 'install: --no-document\nupdate: --no-document' >> /opt/jruby/etc/gemrc
6161

6262
# don't create ".bundle" in all our apps
63-
ENV GEM_HOME /usr/local/bundle
63+
ENV GEM_HOME=/usr/local/bundle
6464
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
6565
BUNDLE_APP_CONFIG="$GEM_HOME"
66-
ENV PATH $GEM_HOME/bin:$PATH
66+
ENV PATH=$GEM_HOME/bin:$PATH
6767

6868
# adjust permissions of a few directories for running "gem install" as an arbitrary user
6969
RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME"

‎src/engines/jruby/10.0/Dockerfile.musl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ RUN true "${REPRO_RUN_KEY}" && apk update
3232
RUN apk add curl bash
3333

3434
# Install JRuby, pinned for reproducibility
35-
ENV JRUBY_VERSION 10.0.2.0
36-
ENV JRUBY_SHA256 b8a026f38aa98461a04ed0aa0b20891ce257ecbe53e124719ce9ee5b804525f1
35+
ENV JRUBY_VERSION=10.0.2.0
36+
ENV JRUBY_SHA256=b8a026f38aa98461a04ed0aa0b20891ce257ecbe53e124719ce9ee5b804525f1
3737
RUN mkdir /opt/jruby \
3838
&& curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
3939
&& echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \
4040
&& tar -zx --strip-components=1 -f /tmp/jruby.tar.gz -C /opt/jruby \
4141
&& rm /tmp/jruby.tar.gz \
4242
&& ln -sf /opt/jruby/bin/jruby /usr/local/bin/ruby
43-
ENV PATH /opt/jruby/bin:$PATH
43+
ENV PATH=/opt/jruby/bin:$PATH
4444

4545
# Skip installing gem documentation
4646
RUN mkdir -p /opt/jruby/etc \

‎src/engines/jruby/9.2/Dockerfile.gnu‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,33 +38,33 @@ RUN true "${REPRO_RUN_KEY}" && apt-get update
3838
RUN apt-get install -y libc6-dev build-essential git locales tzdata --no-install-recommends && rm -rf /var/lib/apt/lists/*
3939

4040
# Ensure sane locale (`eclipse-temurin` already updated `/etc/locale.gen` for `en_US.UTF-8`)
41-
ENV LANG en_US.UTF-8
42-
ENV LANGUAGE en_US:en
41+
ENV LANG=en_US.UTF-8
42+
ENV LANGUAGE=en_US:en
4343

4444
# Ensure consistent timezone
4545
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
4646

4747
# Install JRuby, pinned for reproducibility
48-
ENV JRUBY_VERSION 9.2.21.0
49-
ENV JRUBY_SHA256 dbf05fca4f61bd7d5131d9b83c5f4d1a249213c474b82def37e82013969c8b8a
48+
ENV JRUBY_VERSION=9.2.21.0
49+
ENV JRUBY_SHA256=dbf05fca4f61bd7d5131d9b83c5f4d1a249213c474b82def37e82013969c8b8a
5050
RUN mkdir /opt/jruby \
5151
&& curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
5252
&& echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \
5353
&& tar -zx --strip-components=1 -f /tmp/jruby.tar.gz -C /opt/jruby \
5454
&& rm /tmp/jruby.tar.gz \
5555
&& update-alternatives --install /usr/local/bin/ruby ruby /opt/jruby/bin/jruby 1
56-
ENV PATH /opt/jruby/bin:$PATH
56+
ENV PATH=/opt/jruby/bin:$PATH
5757

5858
# Skip installing gem documentation
5959
RUN mkdir -p /opt/jruby/etc \
6060
&& echo -e 'install: --no-document\nupdate: --no-document' >> /opt/jruby/etc/gemrc
6161

6262

6363
# don't create ".bundle" in all our apps
64-
ENV GEM_HOME /usr/local/bundle
64+
ENV GEM_HOME=/usr/local/bundle
6565
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
6666
BUNDLE_APP_CONFIG="$GEM_HOME"
67-
ENV PATH $GEM_HOME/bin:$PATH
67+
ENV PATH=$GEM_HOME/bin:$PATH
6868

6969
# adjust permissions of a few directories for running "gem install" as an arbitrary user
7070
RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME"

‎src/engines/jruby/9.2/Dockerfile.musl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ RUN true "${REPRO_RUN_KEY}" && apk update
3232
RUN apk add curl bash
3333

3434
# Install JRuby, pinned for reproducibility
35-
ENV JRUBY_VERSION 9.2.21.0
36-
ENV JRUBY_SHA256 dbf05fca4f61bd7d5131d9b83c5f4d1a249213c474b82def37e82013969c8b8a
35+
ENV JRUBY_VERSION=9.2.21.0
36+
ENV JRUBY_SHA256=dbf05fca4f61bd7d5131d9b83c5f4d1a249213c474b82def37e82013969c8b8a
3737
RUN mkdir /opt/jruby \
3838
&& curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
3939
&& echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \
4040
&& tar -zx --strip-components=1 -f /tmp/jruby.tar.gz -C /opt/jruby \
4141
&& rm /tmp/jruby.tar.gz \
4242
&& ln -sf /opt/jruby/bin/jruby /usr/local/bin/ruby
43-
ENV PATH /opt/jruby/bin:$PATH
43+
ENV PATH=/opt/jruby/bin:$PATH
4444

4545
# Skip installing gem documentation
4646
RUN mkdir -p /opt/jruby/etc \

‎src/engines/jruby/9.3/Dockerfile.gnu‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,32 +38,32 @@ RUN true "${REPRO_RUN_KEY}" && apt-get update
3838
RUN apt-get install -y libc6-dev build-essential git locales tzdata --no-install-recommends && rm -rf /var/lib/apt/lists/*
3939

4040
# Ensure sane locale (`eclipse-temurin` already updated `/etc/locale.gen` for `en_US.UTF-8`)
41-
ENV LANG en_US.UTF-8
42-
ENV LANGUAGE en_US:en
41+
ENV LANG=en_US.UTF-8
42+
ENV LANGUAGE=en_US:en
4343

4444
# Ensure consistent timezone
4545
RUN ln -sf /usr/share/zoneinfo/Etc/UTC /etc/localtime
4646

4747
# Install JRuby, pinned for reproducibility
48-
ENV JRUBY_VERSION 9.3.15.0
49-
ENV JRUBY_SHA256 0f8f8e4ed2fe97976d1c68350e967b937a860001fe3cbb42247a8612ab246628
48+
ENV JRUBY_VERSION=9.3.15.0
49+
ENV JRUBY_SHA256=0f8f8e4ed2fe97976d1c68350e967b937a860001fe3cbb42247a8612ab246628
5050
RUN mkdir /opt/jruby \
5151
&& curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
5252
&& echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \
5353
&& tar -zx --strip-components=1 -f /tmp/jruby.tar.gz -C /opt/jruby \
5454
&& rm /tmp/jruby.tar.gz \
5555
&& update-alternatives --install /usr/local/bin/ruby ruby /opt/jruby/bin/jruby 1
56-
ENV PATH /opt/jruby/bin:$PATH
56+
ENV PATH=/opt/jruby/bin:$PATH
5757

5858
# Skip installing gem documentation
5959
RUN mkdir -p /opt/jruby/etc \
6060
&& echo -e 'install: --no-document\nupdate: --no-document' >> /opt/jruby/etc/gemrc
6161

6262
# don't create ".bundle" in all our apps
63-
ENV GEM_HOME /usr/local/bundle
63+
ENV GEM_HOME=/usr/local/bundle
6464
ENV BUNDLE_SILENCE_ROOT_WARNING=1 \
6565
BUNDLE_APP_CONFIG="$GEM_HOME"
66-
ENV PATH $GEM_HOME/bin:$PATH
66+
ENV PATH=$GEM_HOME/bin:$PATH
6767

6868
# adjust permissions of a few directories for running "gem install" as an arbitrary user
6969
RUN mkdir -p "$GEM_HOME" && chmod 1777 "$GEM_HOME"

‎src/engines/jruby/9.3/Dockerfile.musl‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ RUN true "${REPRO_RUN_KEY}" && apk update
3232
RUN apk add curl bash
3333

3434
# Install JRuby, pinned for reproducibility
35-
ENV JRUBY_VERSION 9.3.15.0
36-
ENV JRUBY_SHA256 0f8f8e4ed2fe97976d1c68350e967b937a860001fe3cbb42247a8612ab246628
35+
ENV JRUBY_VERSION=9.3.15.0
36+
ENV JRUBY_SHA256=0f8f8e4ed2fe97976d1c68350e967b937a860001fe3cbb42247a8612ab246628
3737
RUN mkdir /opt/jruby \
3838
&& curl -fSL https://repo1.maven.org/maven2/org/jruby/jruby-dist/${JRUBY_VERSION}/jruby-dist-${JRUBY_VERSION}-bin.tar.gz -o /tmp/jruby.tar.gz \
3939
&& echo "$JRUBY_SHA256 /tmp/jruby.tar.gz" | sha256sum -c - \
4040
&& tar -zx --strip-components=1 -f /tmp/jruby.tar.gz -C /opt/jruby \
4141
&& rm /tmp/jruby.tar.gz \
4242
&& ln -sf /opt/jruby/bin/jruby /usr/local/bin/ruby
43-
ENV PATH /opt/jruby/bin:$PATH
43+
ENV PATH=/opt/jruby/bin:$PATH
4444

4545
# Skip installing gem documentation
4646
RUN mkdir -p /opt/jruby/etc \

0 commit comments

Comments
 (0)