Skip to content

Commit

Permalink
Merge branch 'main' into abstract-tracked
Browse files Browse the repository at this point in the history
  • Loading branch information
KacperFKorban authored Dec 19, 2024
2 parents b3fedfd + 4b7f321 commit 214bfda
Show file tree
Hide file tree
Showing 1,052 changed files with 12,048 additions and 166,324 deletions.
5 changes: 3 additions & 2 deletions .github/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,12 @@ RUN apt-get update && \
openjdk-17-jdk-headless \
openjdk-21-jdk-headless && \
(curl -fsSL https://deb.nodesource.com/setup_18.x | bash -) && \
apt-get install -y nodejs
apt-get install -y nodejs && \
apt-get install -y zip unzip


# Install sbt
ENV SBT_HOME /usr/local/sbt
ENV PATH ${SBT_HOME}/bin:${PATH}
ENV SBT_VERSION 1.9.0
ENV SBT_VERSION 1.10.5
RUN curl -sL "https://github.com/sbt/sbt/releases/download/v$SBT_VERSION/sbt-$SBT_VERSION.tgz" | gunzip | tar -x -C /usr/local
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE/fix-issue.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ assignees: ''

<!--
TODO first sign the CLA
https://www.lightbend.com/contribute/cla/scala
https://contribute.akka.io/cla/scala
-->

## Fix #XYZ
Expand Down
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE/other-pr.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ assignees: ''

<!--
TODO first sign the CLA
https://www.lightbend.com/contribute/cla/scala
https://contribute.akka.io/cla/scala
-->

## Description
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-msi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ on:
workflow_call:

env:
# NECESSARY FLAG TO CORRECTLY CONFIGURE THE VERSION FOR SCALA
RELEASEBUILD: yes
# Release only happends when triggering CI by pushing tag
RELEASEBUILD: ${{ startsWith(github.event.ref, 'refs/tags/') && 'yes' || 'no' }}

jobs:
build:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ jobs:
distribution: temurin
java-version: ${{ inputs.java-version }}
cache : sbt
- uses: sbt/setup-sbt@v1
- name: Build and pack the SDK (universal)
run : ./project/scripts/sbt dist/Universal/stage
- name: Build and pack the SDK (linux x86-64)
Expand Down
Loading

0 comments on commit 214bfda

Please sign in to comment.