Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into issue-10917
Browse files Browse the repository at this point in the history
  • Loading branch information
oprypin committed Jan 5, 2025
2 parents 9004ae8 + 11cf206 commit 45b7b13
Show file tree
Hide file tree
Showing 1,513 changed files with 102,223 additions and 30,339 deletions.
61 changes: 35 additions & 26 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
version: 2.1

parameters:
distribution-scripts-repo:
description: "Git url https://github.com/crystal-lang/distribution-scripts/"
type: string
default: "https://github.com/crystal-lang/distribution-scripts.git"
distribution-scripts-version:
description: "Git ref for version of https://github.com/crystal-lang/distribution-scripts/"
type: string
default: "e9cafa1a93a487169e561759e9a2d065c35e0770"
default: "588099d9e9de7ecf5925365796d30f832870e18c"
previous_crystal_base_url:
description: "Prefix for URLs to Crystal bootstrap compiler"
type: string
default: "https://github.com/crystal-lang/crystal/releases/download/1.5.0/crystal-1.5.0-1"
default: "https://github.com/crystal-lang/crystal/releases/download/1.14.0/crystal-1.14.0-1"

defaults:
environment: &env
Expand All @@ -19,7 +23,9 @@ defaults:
- run: bin/ci prepare_system
- run: echo 'export CURRENT_TAG="$CIRCLE_TAG"' >> $BASH_ENV
- run: bin/ci prepare_build
- run: bin/ci build
- run:
command: bin/ci build
no_output_timeout: 30m
- run:
when: always
command: |
Expand All @@ -33,7 +39,7 @@ defaults:
jobs:
test_linux:
machine:
image: ubuntu-2004:202201-02
image: default
environment:
<<: *env
TRAVIS_OS_NAME: linux
Expand All @@ -45,7 +51,9 @@ jobs:
- run: bin/ci prepare_system
- run: echo 'export CURRENT_TAG="$CIRCLE_TAG"' >> $BASH_ENV
- run: bin/ci prepare_build
- run: bin/ci build
- run:
command: bin/ci build
no_output_timeout: 30m
- run:
when: always
command: |
Expand All @@ -62,7 +70,7 @@ jobs:

test_alpine:
machine:
image: ubuntu-2004:202201-02
image: default
environment:
<<: *env
TRAVIS_OS_NAME: linux
Expand All @@ -73,7 +81,7 @@ jobs:

test_darwin:
macos:
xcode: 13.4.1
xcode: 15.4.0
environment:
<<: *env
TRAVIS_OS_NAME: osx
Expand All @@ -87,7 +95,9 @@ jobs:
- run: echo 'export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:/usr/local/opt/[email protected]/lib/pkgconfig"' >> $BASH_ENV
- run: echo 'export CURRENT_TAG="$CIRCLE_TAG"' >> $BASH_ENV
- run: bin/ci prepare_build
- run: bin/ci build
- run:
command: bin/ci build
no_output_timeout: 30m
- run:
when: always
command: |
Expand All @@ -105,7 +115,8 @@ jobs:

test_preview_mt:
machine:
image: ubuntu-2004:202201-02
image: default
resource_class: large
environment:
<<: *env
TRAVIS_OS_NAME: linux
Expand All @@ -117,7 +128,9 @@ jobs:
- run: echo 'export CURRENT_TAG="$CIRCLE_TAG"' >> $BASH_ENV
- run: bin/ci prepare_build
- run: bin/ci with_build_env 'make crystal'
- run: bin/ci with_build_env 'CRYSTAL_WORKERS=4 make std_spec threads=1 FLAGS="-D preview_mt" junit_output=.junit/std_spec.xml'
- run:
command: bin/ci with_build_env 'CRYSTAL_WORKERS=4 make std_spec threads=1 FLAGS="-D preview_mt" junit_output=.junit/std_spec.xml'
no_output_timeout: 30m
- run:
when: always
command: |
Expand All @@ -134,7 +147,7 @@ jobs:
steps:
# checkout specific distribution-scripts version to perform releases and nightly
- run: |
git clone https://github.com/crystal-lang/distribution-scripts.git ~/distribution-scripts
git clone << pipeline.parameters.distribution-scripts-repo >> ~/distribution-scripts
cd ~/distribution-scripts
git checkout << pipeline.parameters.distribution-scripts-version >>
# persist relevant information for build process
Expand Down Expand Up @@ -251,7 +264,7 @@ jobs:

dist_linux:
machine:
image: ubuntu-2004:202201-02
image: default
steps:
- attach_workspace:
at: /tmp/workspace
Expand All @@ -272,7 +285,7 @@ jobs:

dist_darwin:
macos:
xcode: 13.4.1
xcode: 15.3.0
shell: /bin/bash --login -eo pipefail
steps:
- restore_cache:
Expand All @@ -283,12 +296,7 @@ jobs:
command: |
brew unlink python@2 || true
# We need ruby-install >= 0.8.3
brew install ruby-install
ruby-install ruby 2.7.3
brew install pkgconfig libtool
brew install ruby@3 libffi pkgconfig libtool automake
sudo mkdir -p /opt/crystal
sudo chown $(whoami) /opt/crystal/
Expand All @@ -299,7 +307,6 @@ jobs:
- run:
no_output_timeout: 40m
command: |
echo "2.7.3" > /tmp/workspace/distribution-scripts/.ruby-version
cd /tmp/workspace/distribution-scripts
source build.env
cd omnibus
Expand Down Expand Up @@ -334,7 +341,7 @@ jobs:
dist_docker:
machine:
image: ubuntu-2004:202201-02
image: default
steps:
- attach_workspace:
at: /tmp/workspace
Expand All @@ -350,7 +357,7 @@ jobs:

publish_docker:
machine:
image: ubuntu-2004:202201-02
image: default
steps:
- attach_workspace:
at: /tmp/workspace
Expand Down Expand Up @@ -405,7 +412,7 @@ jobs:
dist_docs:
machine:
image: ubuntu-2004:202201-02
image: default
steps:
- attach_workspace:
at: /tmp/workspace
Expand All @@ -428,7 +435,7 @@ jobs:
- image: manastech/s3cmd:2.2-alpine
environment:
<<: *env
AWS_ACCESS_KEY_ID: AKIA2EEIIRCJCMOSW2XH
AWS_ACCESS_KEY_ID: AKIA2EEIIRCJDEDGK6MQ
steps:
- attach_workspace:
at: /tmp/workspace
Expand All @@ -451,7 +458,7 @@ jobs:

test_dist_linux_on_docker:
machine:
image: ubuntu-2004:202201-02
image: default
environment:
<<: *env
TRAVIS_OS_NAME: linux
Expand All @@ -470,7 +477,9 @@ jobs:
- run: bin/ci prepare_system
- run: echo 'export CURRENT_TAG="$CIRCLE_TAG"' >> $BASH_ENV
- run: bin/ci prepare_build
- run: bin/ci build
- run:
command: bin/ci build
no_output_timeout: 30m

workflows:
version: 2
Expand Down
28 changes: 28 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
## Sources

*.cr text eol=lf

## Sourced-in dependencies

lib/** linguist-vendored

## Generated files

# produced by scripts/generate_windows_zone_names.cr
src/crystal/system/win32/zone_names.cr linguist-generated
# produced by scripts/generate_html_entities.cr
src/html/entities.cr linguist-generated
# produced by scripts/generate_ssl_server_defaults.cr
src/openssl/ssl/defaults.cr linguist-generated
# produced by scripts/generate_grapheme_properties.cr
src/string/grapheme/properties.cr linguist-generated
# produced by scripts/generate_unicode_data.cr
src/unicode/data.cr linguist-generated
# produced by scripts/generate_grapheme_break_specs.cr
spec/std/string/grapheme_break_spec.cr linguist-generated
# produced by spec/generate_wasm32_spec.sh
spec/wasm32_std_spec.cr linguist-generated

## Syntax highlighting

Makefile.win linguist-language=makefile
4 changes: 4 additions & 0 deletions .github/ISSUE_TEMPLATE/feature-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,7 @@ labels: kind:feature
- Describe the feature you would like, optionally illustrated by examples, and how it will solve the above problem.
- Describe considered alternative solutions, and the reasons why you have not proposed them as a solution here.
- Does it break backward compatibility, if yes then what's the migration path?

In case this proposal includes a substantial change to the language, we ask you to go through an [RFC process](https://github.com/crystal-lang/rfcs).

The best place to start an open discussion about potential changes is the [Crystal forum](https://forum.crystal-lang.org/c/crystal-contrib/6).
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@ We thank you for helping improve Crystal. In order to ease the reviewing process
2. Focus the PR to the referred issue, and restraint from adding unrelated changes/additions. We do welcome another PR if you fixed another issue.

3. If your change is big, consider breaking it into several smaller PRs. In general, the smaller the change, the quicker we can review it.

4. ⚠️ Please do not amend previous commits and force push to the PR branch. This makes reviews much harder because reference to previous state is hidden.
27 changes: 27 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
],
"separateMajorMinor": false,
"packageRules": [
{
"matchDatasources": [
"docker"
],
"enabled": false
},
{
"groupName": "GH Actions",
"matchManagers": [
"github-actions"
],
"schedule": [
"after 5am and before 8am on Wednesday"
]
}
],
"labels": [
"topic:infrastructure/ci"
]
}
Loading

0 comments on commit 45b7b13

Please sign in to comment.