fix(curve-dalek.rust)

with the release of rust 1.78 we can undo these... tweaks.

fix deno specifically

Revert "fix deno specifically"

This reverts commit 4dbe7bd82386dc429a6d448b2004c3df4f0c9807.

revert deno
This commit is contained in:
Jacob Heider 2024-05-02 14:15:24 -04:00 committed by Jacob Heider
parent 8da334c5a6
commit bc6433bf3e
7 changed files with 23 additions and 74 deletions

View file

@ -1,5 +1,5 @@
distributable: distributable:
url: https://github.com/extrawurst/gitui/archive/refs/tags/v{{version}}.tar.gz url: https://github.com/extrawurst/gitui/archive/refs/tags/{{version.tag}}.tar.gz
strip-components: 1 strip-components: 1
provides: provides:
@ -7,7 +7,6 @@ provides:
versions: versions:
github: extrawurst/gitui/tags github: extrawurst/gitui/tags
strip: /v/
dependencies: dependencies:
perl.org: '*' perl.org: '*'
@ -17,20 +16,14 @@ dependencies:
build: build:
dependencies: dependencies:
rust-lang.org: '>=1.60' rust-lang.org: ^1.78 # stdsimd changes
rust-lang.org/cargo: '*' rust-lang.org/cargo: '*'
script: script: cargo install --path . --locked --root {{prefix}}
# curve25519-dalek 4.1.2 introduces some odd simd issues on x86-64
- run: sed -i
-e 's/version = "4.1.2"/version = "4.1.1"/'
-e 's/0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348/e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c/'
Cargo.lock
- cargo install --path . --locked --root {{prefix}}
env: env:
linux: linux:
RUSTFLAGS: '-C linker=cc' RUSTFLAGS: '-C linker=cc'
# See: https://docs.rs/openssl/latest/openssl/#manual # See: https://docs.rs/openssl/latest/openssl/#manual
OPENSSL_NO_VENDOR: true # Always find OpenSSL in the system, even if the vendored feature is enabled. OPENSSL_NO_VENDOR: true # Always find OpenSSL in the system, even if the vendored feature is enabled.
OPENSSL_DIR: '{{ deps.openssl.org.prefix }}' # Use tea's openssl installation directory OPENSSL_DIR: '{{ deps.openssl.org.prefix }}' # Use pkgx's openssl installation directory
test: gitui --version test: gitui --version

View file

@ -1,28 +1,20 @@
distributable: distributable:
url: https://github.com/sigp/lighthouse/archive/refs/tags/v{{ version }}.tar.gz url: https://github.com/sigp/lighthouse/archive/refs/tags/{{ version.tag }}.tar.gz
strip-components: 1 strip-components: 1
versions: versions:
github: sigp/lighthouse github: sigp/lighthouse
strip: /^v/
dependencies: dependencies:
zlib.net: ^1 zlib.net: ^1
build: build:
dependencies: dependencies:
rust-lang.org: ^1.66 rust-lang.org: ^1.78 # stdsimd changes
rust-lang.org/cargo: '*' rust-lang.org/cargo: '*'
cmake.org: ^3.12 cmake.org: ^3.12
protobuf.dev: '*' protobuf.dev: '*'
script: script: make CARGO_INSTALL_EXTRA_FLAGS="--root {{prefix}}"
# curve25519-dalek 4.1.2 introduces some odd simd issues on x86-64
- run: sed -i
-e 's/version = "4.1.2"/version = "4.1.1"/'
-e 's/0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348/e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c/'
Cargo.lock
if: '>=5.0.0'
- make CARGO_INSTALL_EXTRA_FLAGS="--root {{prefix}}"
test: make test-release test: make test-release
provides: provides:

View file

@ -1,5 +1,5 @@
distributable: distributable:
url: https://github.com/jdx/mise/archive/refs/tags/v{{version}}.tar.gz url: https://github.com/jdx/mise/archive/refs/tags/{{version.tag}}.tar.gz
strip-components: 1 strip-components: 1
# renamed at 2024.1.0 # renamed at 2024.1.0
@ -17,17 +17,10 @@ dependencies:
build: build:
dependencies: dependencies:
rust-lang.org: ^1.70 rust-lang.org: ^1.78 # stdsimd changes
rust-lang.org/cargo: '*' rust-lang.org/cargo: '*'
freedesktop.org/pkg-config: '*' freedesktop.org/pkg-config: '*'
script: script:
# curve25519-dalek 4.1.2 introduces some odd simd issues on x86-64
- run: sed -i
-e 's/version = "4.1.2"/version = "4.1.1"/'
-e 's/0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348/e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c/'
Cargo.lock
if: '>=2024.2.6'
- cargo install --locked --path . --root {{prefix}} - cargo install --locked --path . --root {{prefix}}
# FIXME: <2024 isn't matching like it should. this should be split at 2024.1.0 # FIXME: <2024 isn't matching like it should. this should be split at 2024.1.0
- run: | - run: |

View file

@ -1,5 +1,5 @@
distributable: distributable:
url: https://github.com/chaaz/versio/archive/refs/tags/v{{ version }}.tar.gz url: https://github.com/chaaz/versio/archive/refs/tags/{{ version.tag }}.tar.gz
strip-components: 1 strip-components: 1
provides: provides:
@ -7,7 +7,6 @@ provides:
versions: versions:
github: chaaz/versio github: chaaz/versio
strip: /v/
dependencies: dependencies:
openssl.org: ^1.1 openssl.org: ^1.1
@ -18,18 +17,9 @@ dependencies:
build: build:
dependencies: dependencies:
rust-lang.org: '>=1.65' rust-lang.org: ^1.78 # stdsimd changes
rust-lang.org/cargo: '*' rust-lang.org/cargo: '*'
freedesktop.org/pkg-config: '*' freedesktop.org/pkg-config: '*'
script: script: cargo install --locked --path . --root {{prefix}}
# curve25519-dalek 4.1.2 introduces some odd simd issues on x86-64
- run: sed -i
-e 's/version = "4.1.2"/version = "4.1.1"/'
-e 's/0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348/e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c/'
Cargo.lock
if: 0.8.3
- cargo install --locked --path . --root {{prefix}}
test: test: test "$(versio --version)" = "versio {{version}}"
script:
- test "$(versio --version)" = "versio {{version}}"

View file

@ -1,5 +1,5 @@
distributable: distributable:
url: https://github.com/FuelLabs/sway/archive/refs/tags/v{{version}}.tar.gz url: https://github.com/FuelLabs/sway/archive/refs/tags/{{version.tag}}.tar.gz
strip-components: 1 strip-components: 1
versions: versions:
@ -14,24 +14,17 @@ dependencies:
build: build:
dependencies: dependencies:
rust-lang.org: 1 rust-lang.org: ^1.78 # stdsimd changes
rust-lang.org/cargo: ^0 rust-lang.org/cargo: ^0
# needed to build openssl module # needed to build openssl module
perl.org: '*' perl.org: '*'
gnu.org/make: '*' gnu.org/make: '*'
script: script: cargo install --locked --path forc --root {{prefix}}
# curve25519-dalek 4.1.2 introduces some odd simd issues on x86-64
- run: sed -i
-e 's/version = "4.1.2"/version = "4.1.1"/'
-e 's/0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348/e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c/'
Cargo.lock
if: '>=0.51.0'
- cargo install --locked --path forc --root {{prefix}}
test: test:
script: script:
- forc new tea_test - forc new pkgx_test
- cd tea_test - cd pkgx_test
- cat $FIXTURE >src/main.sw - cat $FIXTURE >src/main.sw
- forc test - forc test
fixture: | fixture: |

View file

@ -1,20 +1,15 @@
distributable: distributable:
url: https://github.com/n0-computer/iroh/archive/refs/tags/v{{version}}.tar.gz url: https://github.com/n0-computer/iroh/archive/refs/tags/{{version.tag}}.tar.gz
strip-components: 1 strip-components: 1
versions: versions:
github: n0-computer/iroh/releases/tags github: n0-computer/iroh
build: build:
dependencies: dependencies:
rust-lang.org/cargo: '*' rust-lang.org/cargo: '*'
rust-lang.org: '^1.70' rust-lang.org: ^1.78 # stdsimd changes
script: script:
# curve25519-dalek 4.1.2 introduces some odd simd issues on x86-64
- run: sed -i
-e 's/version = "4.1.2"/version = "4.1.1"/'
-e 's/0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348/e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c/'
Cargo.lock
- run: cargo install --path . --locked --root {{prefix}} - run: cargo install --path . --locked --root {{prefix}}
if: <0.6.0 if: <0.6.0
- run: cargo install --path iroh --locked --root {{prefix}} - run: cargo install --path iroh --locked --root {{prefix}}

View file

@ -1,5 +1,5 @@
distributable: distributable:
url: https://github.com/jdx/mise/archive/refs/tags/v{{version}}.tar.gz url: https://github.com/jdx/mise/archive/refs/tags/{{version.tag}}.tar.gz
strip-components: 1 strip-components: 1
# renamed at 2024.1.0 # renamed at 2024.1.0
@ -19,17 +19,10 @@ dependencies:
build: build:
dependencies: dependencies:
rust-lang.org: ^1.70 rust-lang.org: ^1.78 # stdsimd changes
rust-lang.org/cargo: '*' rust-lang.org/cargo: '*'
freedesktop.org/pkg-config: '*' freedesktop.org/pkg-config: '*'
script: script:
# curve25519-dalek 4.1.2 introduces some odd simd issues on x86-64
- run: sed -i
-e 's/version = "4.1.2"/version = "4.1.1"/'
-e 's/0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348/e89b8c6a2e4b1f45971ad09761aafb85514a84744b67a95e32c3cc1352d1f65c/'
Cargo.lock
if: '>=2024.2.6'
- cargo install --locked --path . --root {{prefix}} - cargo install --locked --path . --root {{prefix}}
# FIXME: <2024 isn't matching like it should. this should be split at 2024.1.0 # FIXME: <2024 isn't matching like it should. this should be split at 2024.1.0
- run: | - run: |