mirror of
https://github.com/roc-lang/roc.git
synced 2025-08-03 19:58:18 +00:00
.rh and .rm adjustments, basic-cli nightly prep
This commit is contained in:
parent
1061b7e8c0
commit
f619a35c7c
8 changed files with 13 additions and 17 deletions
|
@ -41,13 +41,13 @@ jobs:
|
|||
CARGO_BUILD_TARGET: x86_64-unknown-linux-musl
|
||||
run: ./ci/build_basic_cli.sh linux_x86_64 "--linker legacy"
|
||||
|
||||
- name: Save .rh1, .rm2 and .o file
|
||||
- name: Save .rh, .rm and .o file
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: linux-x86_64-files
|
||||
path: |
|
||||
basic-cli/src/metadata_linux-x86_64.rm2
|
||||
basic-cli/src/linux-x86_64.rh1
|
||||
basic-cli/src/metadata_linux-x86_64.rm
|
||||
basic-cli/src/linux-x86_64.rh
|
||||
basic-cli/src/linux-x86_64.o
|
||||
|
||||
build-macos-x86_64-files:
|
||||
|
|
1
.github/workflows/nightly_linux_x86_64.yml
vendored
1
.github/workflows/nightly_linux_x86_64.yml
vendored
|
@ -1,4 +1,5 @@
|
|||
on:
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
schedule:
|
||||
- cron: '0 9 * * *'
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
on:
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
schedule:
|
||||
- cron: '0 9 * * *'
|
||||
|
|
1
.github/workflows/nightly_macos_x86_64.yml
vendored
1
.github/workflows/nightly_macos_x86_64.yml
vendored
|
@ -1,4 +1,5 @@
|
|||
on:
|
||||
pull_request:
|
||||
workflow_dispatch:
|
||||
schedule:
|
||||
- cron: '0 9 * * *' # 9=9am utc+0
|
||||
|
|
|
@ -62,7 +62,7 @@ pub fn supported(link_type: LinkType, target: &Triple) -> bool {
|
|||
}
|
||||
}
|
||||
|
||||
pub const PRECOMPILED_HOST_EXT: &str = "rh1"; // Short for "roc host version 1" (so we can change format in the future)
|
||||
pub const PRECOMPILED_HOST_EXT: &str = "rh"; // Short for "roc host"
|
||||
|
||||
pub fn preprocessed_host_filename(target: &Triple) -> Option<String> {
|
||||
roc_target::get_target_triple_str(target).map(|x| format!("{}.{}", x, PRECOMPILED_HOST_EXT))
|
||||
|
@ -71,7 +71,7 @@ pub fn preprocessed_host_filename(target: &Triple) -> Option<String> {
|
|||
fn metadata_file_name(target: &Triple) -> String {
|
||||
let target_triple_str = get_target_triple_str(target);
|
||||
|
||||
format!("metadata_{}.rm2", target_triple_str.unwrap_or("unknown"))
|
||||
format!("metadata_{}.rm", target_triple_str.unwrap_or("unknown"))
|
||||
}
|
||||
|
||||
pub fn link_preprocessed_host(
|
||||
|
|
|
@ -61,14 +61,7 @@ impl Metadata {
|
|||
|e| internal_error!(r#"
|
||||
|
||||
Error:
|
||||
{}
|
||||
|
||||
> This may occur when using a release of roc that relies on a specific metadata format like 'rm2' and the imported platform only has an older metadata format available, like rm1.
|
||||
The platform you are using can be found in the header of your main.roc: `packages {{ pf: <PLATFORM>}}`.
|
||||
You should check if a more recent version of the platform is available.
|
||||
If not, you should notify the author of the platform about this issue.
|
||||
|
||||
"#, e)
|
||||
{}\n"#, e)
|
||||
);
|
||||
|
||||
match deserialize_from(BufReader::new(input)) {
|
||||
|
|
|
@ -151,9 +151,9 @@ fn write_archive<W: Write>(path: &Path, writer: W) -> io::Result<()> {
|
|||
|
||||
if [
|
||||
// surgical linker format
|
||||
Some("rh1"),
|
||||
Some("rh"),
|
||||
// metadata file
|
||||
Some("rm2"),
|
||||
Some("rm"),
|
||||
// legacy linker formats
|
||||
Some("o"),
|
||||
Some("obj"),
|
||||
|
|
4
examples/.gitignore
vendored
4
examples/.gitignore
vendored
|
@ -2,7 +2,7 @@
|
|||
libhost.a
|
||||
libapp.so
|
||||
dynhost
|
||||
*.rm1
|
||||
*.rh1
|
||||
*.rm
|
||||
*.rh
|
||||
|
||||
helloWorld
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue