feat: upload just ide artifacts

enso-org · Feb 3, 2025 · b26eb8e · b26eb8e
1 parent 56afb9e
commit b26eb8e
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 86 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -249,25 +249,6 @@ jobs:
       - run: ./run backend upload
         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/
-      - name: Archive project-manager
-        run: tar -cvf project-manager.tar -C dist/backend .
-      - name: Upload project-manager
-        uses: actions/upload-artifact@v4
-        with:
-          name: project-manager-linux
-          path: project-manager.tar
-      - name: Cleanup
-        run: rm project-manager.tar
       - if: (always())
         name: Clean after
         run: ./run git-clean
@@ -315,15 +296,6 @@ jobs:
       - run: ./run backend upload
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Archive project-manager
-        run: tar -cvf project-manager.tar -C dist/backend .
-      - name: Upload project-manager
-        uses: actions/upload-artifact@v4
-        with:
-          name: project-manager-macos
-          path: project-manager.tar
-      - name: Cleanup
-        run: rm project-manager.tar
       - if: (always())
         name: Clean after
         run: ./run git-clean
@@ -369,15 +341,6 @@ jobs:
       - run: ./run backend upload
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Archive project-manager
-        run: tar -cvf project-manager.tar -C dist/backend .
-      - name: Upload project-manager
-        uses: actions/upload-artifact@v4
-        with:
-          name: project-manager-macos
-          path: project-manager.tar
-      - name: Cleanup
-        run: rm project-manager.tar
       - if: (always())
         name: Clean after
         run: ./run git-clean
@@ -424,15 +387,6 @@ jobs:
       - run: ./run backend upload
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - name: Archive project-manager
-        run: tar -cvf project-manager.tar -C dist/backend .
-      - name: Upload project-manager
-        uses: actions/upload-artifact@v4
-        with:
-          name: project-manager-windows
-          path: project-manager.tar
-      - name: Cleanup
-        run: rm project-manager.tar
       - if: (always())
         name: Clean after
         run: ./run git-clean

diff --git a/build_tools/build/src/ci_gen/job.rs b/build_tools/build/src/ci_gen/job.rs
@@ -480,51 +480,49 @@ impl JobArchetype for WasmTest {
     }
 }
 
-fn backend_steps_builder(command: impl Into<String>, target: Target) -> RunStepsBuilder {
-    RunStepsBuilder::new(command).customize(move |step| {
-        let mut steps = vec![step];
-
-        if target.0 == OS::Linux {
-            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");
-            steps.push(upload_edition_file);
-
-            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/");
-            steps.push(upload_fbs_schema)
-        }
+#[derive(Clone, Copy, Debug)]
+pub struct BuildBackend;
 
-        let archive_project_manager = Step {
-            name: Some("Archive project-manager".into()),
-            run: Some("tar -cvf project-manager.tar -C dist/backend .".into()),
-            ..Default::default()
-        };
-        steps.push(archive_project_manager);
+impl JobArchetype for BuildBackend {
+    fn job(&self, target: Target) -> Job {
+        RunStepsBuilder::new("backend get")
+            .customize(move |step| {
+                let mut steps = vec![step];
 
-        let upload_project_manager = step::upload_artifact("Upload project-manager")
-            .with_custom_argument("name", format!("project-manager-{}", target.0))
-            .with_custom_argument("path", "project-manager.tar");
-        steps.push(upload_project_manager);
+                if target.0 == OS::Linux {
+                    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");
+                    steps.push(upload_edition_file);
+
+                    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/");
+                    steps.push(upload_fbs_schema)
+                }
 
-        let cleanup = Step {
-            name: Some("Cleanup".into()),
-            run: Some("rm project-manager.tar".into()),
-            ..Default::default()
-        };
-        steps.push(cleanup);
+                let archive_project_manager = Step {
+                    name: Some("Archive project-manager".into()),
+                    run: Some("tar -cvf project-manager.tar -C dist/backend .".into()),
+                    ..Default::default()
+                };
+                steps.push(archive_project_manager);
 
-        steps
-    })
-}
+                let upload_project_manager = step::upload_artifact("Upload project-manager")
+                    .with_custom_argument("name", format!("project-manager-{}", target.0))
+                    .with_custom_argument("path", "project-manager.tar");
+                steps.push(upload_project_manager);
 
-#[derive(Clone, Copy, Debug)]
-pub struct BuildBackend;
+                let cleanup = Step {
+                    name: Some("Cleanup".into()),
+                    run: Some("rm project-manager.tar".into()),
+                    ..Default::default()
+                };
+                steps.push(cleanup);
 
-impl JobArchetype for BuildBackend {
-    fn job(&self, target: Target) -> Job {
-        backend_steps_builder("backend get", target).build_job("Build Backend", target)
+                steps
+            })
+            .build_job("Build Backend", target)
     }
 }
 
@@ -533,7 +531,7 @@ pub struct UploadBackend;
 
 impl JobArchetype for UploadBackend {
     fn job(&self, target: Target) -> Job {
-        backend_steps_builder("backend upload", target)
+        RunStepsBuilder::new("backend upload")
             .cleaning(RELEASE_CLEANING_POLICY)
             .build_job("Upload Backend", target)
     }