Page MenuHomePhorge
Files F2707825

No OneTemporary
Actions

Size
7 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5580248..35dee5a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,64 +1,49 @@
stages: [build, release]
image: 'themackabu/rust:zigbuild-1.75.0'
-variables:
- VERSION: '1.6.4'
-
before_script:
- mkdir binary
- apt-get update -yqq
- apt-get install -yqq zip clang llvm
- export CC="/usr/bin/clang"
- export CXX="/usr/bin/clang++"
-build_linux_arm64:
+build_linux_amd64:
stage: build
tags: [fedora]
only: [/^v\d+\.\d+\.\d+.*$/]
script:
- - cargo zigbuild -r --color always
- - zip binary/pmc_${VERSION}_linux_amd64.zip target/release/pmc
+ - cargo zigbuild -r -vv --color always
+ - zip binary/pmc_$CI_COMMIT_TAG_linux_amd64.zip target/release/pmc
artifacts:
- paths: [/binary]
+ paths: [binary/]
-build_linux_amd64:
+build_linux_aarch64:
stage: build
tags: [fedora]
only: [/^v\d+\.\d+\.\d+.*$/]
script:
- - cargo zigbuild -r --target x86_64-unknown-linux-gnu --color always
- - zip binary/pmc_${VERSION}_linux_amd64.zip target/x86_64-unknown-linux-gnu/release/pmc
+ - cargo zigbuild -r -vv --target aarch64-unknown-linux-gnu --color always
+ - zip binary/pmc_$CI_COMMIT_TAG_linux_aarch64.zip target/aarch64-unknown-linux-gnu/release/pmc
artifacts:
- paths: [/binary]
+ paths: [binary/]
build_darwin_amd64:
stage: build
tags: [fedora]
only: [/^v\d+\.\d+\.\d+.*$/]
script:
- - cargo zigbuild -r --target x86_64-apple-darwin --color always
- - zip binary/pmc_${VERSION}_darwin_amd64.zip target/x86_64-apple-darwin/release/pmc
+ - cargo zigbuild -r -vv --target x86_64-apple-darwin --color always
+ - zip binary/pmc_$CI_COMMIT_TAG_darwin_amd64.zip target/x86_64-apple-darwin/release/pmc
artifacts:
- paths: [/binary]
+ paths: [binary/]
-build_darwin_arm:
+build_darwin_aarch64:
stage: build
tags: [fedora]
only: [/^v\d+\.\d+\.\d+.*$/]
script:
- - cargo zigbuild -r --target aarch64-apple-darwin --color always
- - zip binary/pmc_${VERSION}_darwin_arm.zip target/aarch64-apple-darwin/release/pmc
+ - cargo zigbuild -r -vv --target aarch64-apple-darwin --color always
+ - zip binary/pmc_$CI_COMMIT_TAG_darwin_arm.zip target/aarch64-apple-darwin/release/pmc
artifacts:
- paths: [/binary]
-
-release:
- stage: release
- image: registry.gitlab.com/gitlab-org/release-cli:latest
- rules:
- - if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+.*$/'
- script:
- - echo "running release_job for $TAG"
- release:
- name: '$CI_COMMIT_TAG'
- tag_name: '$CI_COMMIT_TAG'
- description: 'v0.$CI_PIPELINE_IID'
+ paths: [binary/]
diff --git a/build.rs b/build.rs
index fd38a0b..fecb459 100644
--- a/build.rs
+++ b/build.rs
@@ -1,156 +1,156 @@
use chrono::Datelike;
use flate2::read::GzDecoder;
use reqwest;
use tar::Archive;
use std::{
env,
fs::{self, File},
io::{self, copy},
path::{Path, PathBuf},
process::Command,
};
const NODE_VERSION: &str = "20.10.0";
fn extract_tar_gz(tar: &PathBuf, download_dir: &PathBuf) -> io::Result<()> {
let file = File::open(tar)?;
let decoder = GzDecoder::new(file);
let mut archive = Archive::new(decoder);
archive.unpack(download_dir)?;
Ok(fs::remove_file(tar)?)
}
fn download_file(url: String, destination: &PathBuf, download_dir: &PathBuf) {
if !download_dir.exists() {
fs::create_dir_all(download_dir).unwrap();
}
let mut response = reqwest::blocking::get(url).expect("Failed to send request");
let mut file = File::create(destination).expect("Failed to create file");
copy(&mut response, &mut file).expect("Failed to copy content");
}
fn download_node() -> PathBuf {
#[cfg(target_os = "linux")]
let target_os = "linux";
#[cfg(all(target_os = "macos"))]
let target_os = "darwin";
#[cfg(all(target_arch = "arm"))]
let target_arch = "armv7l";
#[cfg(all(target_arch = "x86_64"))]
let target_arch = "x64";
#[cfg(all(target_arch = "aarch64"))]
let target_arch = "arm64";
let download_url = format!("https://nodejs.org/dist/v{NODE_VERSION}/node-v{NODE_VERSION}-{target_os}-{target_arch}.tar.gz");
/* paths */
let download_dir = Path::new("target").join("downloads");
let node_extract_dir = download_dir.join(format!("node-v{NODE_VERSION}-{target_os}-{target_arch}"));
if node_extract_dir.is_dir() {
return node_extract_dir;
}
/* download node */
let node_archive = download_dir.join(format!("node-v{}-{}.tar.gz", NODE_VERSION, target_os));
download_file(download_url, &node_archive, &download_dir);
/* extract node */
if let Err(err) = extract_tar_gz(&node_archive, &download_dir) {
panic!("Failed to extract Node.js: {:?}", err)
}
println!("cargo:rustc-env=NODE_HOME={}", node_extract_dir.to_str().unwrap());
return node_extract_dir;
}
fn download_then_build(node_extract_dir: PathBuf) {
let base_dir = match fs::canonicalize(node_extract_dir) {
Ok(path) => path,
Err(err) => panic!("{err}"),
};
let bin = &base_dir.join("bin");
let node = &bin.join("node");
let project_dir = &Path::new("src").join("webui");
let npm = &base_dir.join("lib/node_modules/npm/index.js");
/* set path */
let mut paths = match env::var_os("PATH") {
Some(paths) => env::split_paths(&paths).collect::<Vec<PathBuf>>(),
None => vec![],
};
paths.push(bin.clone());
let path = match env::join_paths(paths) {
Ok(joined) => joined,
Err(err) => panic!("{err}"),
};
/* install deps */
Command::new(node)
.args([npm.to_str().unwrap(), "ci"])
.current_dir(project_dir)
.env("PATH", &path)
.status()
.expect("Failed to install dependencies");
/* build frontend */
Command::new(node)
.args(["node_modules/astro/astro.js", "build"])
.current_dir(project_dir)
.env("PATH", &path)
.status()
.expect("Failed to build frontend");
}
fn main() {
#[cfg(target_os = "windows")]
compile_error!("This project is not supported on Windows.");
#[cfg(target_arch = "x86")]
compile_error!("This project is not supported on 32 bit.");
/* version attributes */
let date = chrono::Utc::now();
let profile = env::var("PROFILE").unwrap();
let output = Command::new("git").args(&["rev-parse", "--short=10", "HEAD"]).output().unwrap();
let output_full = Command::new("git").args(&["rev-parse", "HEAD"]).output().unwrap();
println!("cargo:rustc-env=TARGET={}", env::var("TARGET").unwrap());
println!("cargo:rustc-env=GIT_HASH={}", String::from_utf8(output.stdout).unwrap());
println!("cargo:rustc-env=GIT_HASH_FULL={}", String::from_utf8(output_full.stdout).unwrap());
println!("cargo:rustc-env=BUILD_DATE={}-{}-{}", date.year(), date.month(), date.day());
/* profile matching */
match profile.as_str() {
"debug" => println!("cargo:rustc-env=PROFILE=debug"),
"release" => {
println!("cargo:rustc-env=PROFILE=release");
/* pre-build */
let path = download_node();
download_then_build(path);
/* cc linking */
cxx_build::bridge("src/lib.rs")
.file("lib/bridge.cc")
.file("lib/process.cc")
.file("lib/fork.cc")
.include("lib/include")
.flag_if_supported("-std=c++17")
.compile("bridge");
}
_ => println!("cargo:rustc-env=PROFILE=none"),
}
- let watched = vec!["src/webui", "src/lib.rs", "lib", "lib/include"];
+ let watched = vec!["src/webui/src", "src/lib.rs", "lib", "lib/include"];
watched.iter().for_each(|file| println!("cargo:rerun-if-changed={file}"));
}

File Metadata

Mime Type
text/x-diff
Expires
Sun, Feb 1, 5:40 PM (1 d, 15 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
494867
Default Alt Text
(7 KB)

Event Timeline