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

GitHub Artifacts API update #12210

Merged
merged 22 commits into from
Feb 3, 2025
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: upload fbs-schema
4e6 committed Jan 31, 2025
commit 92d995bb3008d9bf4cb64c3819130b02ae4a4b0d
10 changes: 10 additions & 0 deletions .github/workflows/engine-checks-nightly.yml
Original file line number Diff line number Diff line change
@@ -49,6 +49,16 @@ jobs:
- run: ./run backend ci-check
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload Edition File
uses: actions/upload-artifact@v4
with:
name: Edition File
path: distribution/editions/*.yaml
- name: Upload fbs-schema
uses: actions/upload-artifact@v4
with:
name: fbs-schema
path: engine/language-server/src/main/schema/
- if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
name: Clean after
run: ./run git-clean
10 changes: 10 additions & 0 deletions .github/workflows/engine-checks.yml
Original file line number Diff line number Diff line change
@@ -51,6 +51,16 @@ jobs:
- run: ./run backend ci-check
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Upload Edition File
uses: actions/upload-artifact@v4
with:
name: Edition File
path: distribution/editions/*.yaml
- name: Upload fbs-schema
uses: actions/upload-artifact@v4
with:
name: fbs-schema
path: engine/language-server/src/main/schema/
- if: "(always()) && (contains(github.event.pull_request.labels.*.name, 'CI: Clean build required') || inputs.clean_build_required)"
name: Clean after
run: ./run git-clean
16 changes: 10 additions & 6 deletions build_tools/build/src/ci_gen/job.rs
Original file line number Diff line number Diff line change
@@ -679,13 +679,17 @@ pub struct CiCheckBackend {
impl JobArchetype for CiCheckBackend {
fn job(&self, target: Target) -> Job {
let job_name = format!("Engine ({})", self.graal_edition);
let upload_edition_file =
step::upload_artifact("Upload Edition File")
.with_custom_argument("name", paths::EDITION_FILE_ARTIFACT_NAME)
.with_custom_argument("path", "distribution/editions/*.yaml");
let mut job_builder = RunStepsBuilder::new("backend ci-check");
if target.0 == OS::Linux && ide_ci::ci::run_in_ci() && self.graal_edition == graalvm::Edition::Community {
job_builder = job_builder.customize(move |step| vec![step, upload_edition_file]);
if target.0 == OS::Linux && self.graal_edition == graalvm::Edition::Community {
let upload_edition_file =
step::upload_artifact("Upload Edition File")
.with_custom_argument("name", paths::EDITION_FILE_ARTIFACT_NAME)
.with_custom_argument("path", "distribution/editions/*.yaml");
let upload_fbs_schema =
step::upload_artifact("Upload fbs-schema")
.with_custom_argument("name", "fbs-schema")
.with_custom_argument("path", "engine/language-server/src/main/schema/");
job_builder = job_builder.customize(move |step| vec![step, upload_edition_file, upload_fbs_schema]);
}
let mut job = job_builder.build_job(job_name, target);
match self.graal_edition {
14 changes: 0 additions & 14 deletions build_tools/build/src/engine/context.rs
Original file line number Diff line number Diff line change
@@ -508,20 +508,6 @@ impl RunContext {
}
}

if self.config.build_engine_package {
let schema_dir = self.paths.repo_root.join_iter([
"engine",
"language-server",
"src",
"main",
"schema",
]);
if is_in_env() {
ide_ci::actions::artifacts::upload_compressed_directory(&schema_dir, "fbs-schema")
.await?;
}
}

let graal_version = engine::deduce_graal_bundle(&self.repo_root.build_sbt).await?;
for bundle in ret.bundles() {
bundle.create(&self.repo_root, &graal_version).await?;