Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

helix v23.10 #6

Merged
merged 11 commits into from
Apr 1, 2024
9 changes: 4 additions & 5 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
cdt_name:
- cos6
channel_sources:
Expand All @@ -14,3 +18,6 @@ rust_compiler:
- rust
target_platform:
- linux-64
zip_keys:
- - c_stdlib_version
- cdt_name
8 changes: 7 additions & 1 deletion .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,19 @@
MACOSX_DEPLOYMENT_TARGET:
- '10.9'
MACOSX_SDK_VERSION:
- '10.12'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.9'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
macos_machine:
- x86_64-apple-darwin13.4.0
rust_compiler:
Expand Down
6 changes: 5 additions & 1 deletion .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
- clangxx
cxx_compiler_version:
- '15'
- '16'
macos_machine:
- arm64-apple-darwin20.0.0
rust_compiler:
Expand Down
25 changes: 23 additions & 2 deletions .gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 9 additions & 7 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .scripts/logging_utils.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .scripts/run_docker_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 18 additions & 11 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion README.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions build-locally.py

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions recipe/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

set -o xtrace -o nounset -o pipefail -o errexit

# https://github.com/jaredramirez/tree-sitter-rescript/pull/2
sed -i'' -e s/65609807c628477f3b94052e7ef895885ac51c3c/467dcf99f68c47823d7b378779a6b282d7ef9782/g languages.toml

cargo-bundle-licenses \
--format yaml \
Expand Down
2 changes: 2 additions & 0 deletions recipe/conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
MACOSX_SDK_VERSION: # [osx and x86_64]
- '10.12' # [osx and x86_64]
4 changes: 2 additions & 2 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{% set version = "23.05" %}
{% set version = "23.10" %}
{% set name = "helix" %}

package:
Expand All @@ -7,7 +7,7 @@ package:

source:
url: https://github.com/helix-editor/helix/releases/download/{{ version }}/{{ name }}-{{ version }}-source.tar.xz
sha256: c1ca69facde99d708175c686ce5bf3585e119e372c83e1c3dc1d562c7a8e3d87
sha256: 4e7bcac200b1a15bc9f196bdfd161e4e448dc670359349ae14c18ccc512153e8

build:
number: 0
Expand Down