Change naming

eclipse-esmf · May 24, 2024 · 61c7520 · 61c7520
1 parent 3a1ee2b
commit 61c7520
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/.github/workflows/pull_request_check.yml b/.github/workflows/pull_request_check.yml
@@ -91,7 +91,7 @@ jobs:
         if: matrix.os == 'windows-latest'
         uses: actions/upload-artifact@v4
         with:
-          name: aspect-model-editor-vDEV-SNAPSHOT-win
+          name: ame-backend-win
           path: |
             aspect-model-editor-runtime/target/ame-backend-DEV-SNAPSHOT-win.exe
             aspect-model-editor-runtime/target/*.dll
@@ -102,7 +102,7 @@ jobs:
         if: matrix.os == 'ubuntu-20.04'
         uses: actions/upload-artifact@v4
         with:
-          name: ame-backend-${{ matrix.os }}
+          name: ame-backend-linux
           path: |
             aspect-model-editor-runtime/target/ame-backend-DEV-SNAPSHOT-linux
             aspect-model-editor-runtime/target/*.so
@@ -111,5 +111,5 @@ jobs:
         if: matrix.os == 'macos-12'
         uses: actions/upload-artifact@v4
         with:
-          name: aspect-model-editor-vDEV-SNAPSHOT-mac
+          name: ame-backend-mac
           path: aspect-model-editor-runtime/target/ame-backend-DEV-SNAPSHOT-mac
diff --git a/.github/workflows/tagged_release.yml b/.github/workflows/tagged_release.yml
@@ -130,14 +130,14 @@ jobs:
         if: matrix.os == 'macos-12'
         uses: actions/upload-artifact@v4
         with:
-          name: aspect-model-editor-v${{ github.event.inputs.release_version }}-mac
+          name: ame-backend-v${{ github.event.inputs.release_version }}-mac
           path: aspect-model-editor-runtime/target/ame-backend-${{ github.event.inputs.release_version }}-mac
 
       - name: Upload binary (Linux)
         if: matrix.os == 'ubuntu-20.04'
         uses: actions/upload-artifact@v4
         with:
-          name: aspect-model-editor-v${{ github.event.inputs.release_version }}-linux
+          name: ame-backend-v${{ github.event.inputs.release_version }}-linux
           path: aspect-model-editor-runtime/target/ame-backend-${{ github.event.inputs.release_version }}-linux
 
       # Release Linux executables

diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile
@@ -39,12 +39,14 @@ pipeline {
         stage('Download and unpack Windows artifact') {
             steps {
                 script {
+                    def winOsFile = "ame-backend-v${env.version}-win.zip"
                     sh "curl -L -H 'Accept: application/vnd.github.v3+json' \
                         -H 'Authorization: Bearer ${GITHUB_BOT_TOKEN}' \
                         '${env.artifact_url_win}' \
-                        --output 'aspect-model-editor-v${env.version}-win.zip'"
+                        --output '${winOsFile}'"
                     sh "mkdir -p unpack_dir"
-                    sh "unzip -o aspect-model-editor-v${env.version}-win.zip -d unpack_dir"
+                    sh "unzip -o ame-backend-v${env.version}-win.zip -d unpack_dir"
+                    sh "rm '${winOsFile}'"
                     sh "ls -a unpack_dir"
                 }
             }
@@ -56,7 +58,7 @@ pipeline {
                     sh "mkdir -p signed_dir"
                     sh "find unpack_dir -name '*.dll' -exec mv {} signed_dir \\;"
                     sh "curl -o signed_dir/ame-backend-${env.version}-win.exe -F file=@unpack_dir/ame-backend-${env.version}-win.exe https://cbi.eclipse.org/authenticode/sign"
-                    sh "zip -r aspect-model-editor-v${env.version}-win.zip signed_dir"
+                    sh "zip -r ame-backend-v${env.version}-win.zip signed_dir"
                     sh "ls -a signed_dir"
                 }
             }
@@ -65,11 +67,13 @@ pipeline {
         stage('Download Mac artifact') {
             steps {
                 script {
+                    def macOsFile = "ame-backend-v${env.version}-mac.zip"
                     sh "curl -L -H 'Accept: application/vnd.github.v3+json' \
                         -H 'Authorization: Bearer ${GITHUB_BOT_TOKEN}' \
                         '${env.artifact_url_mac}' \
-                        --output 'aspect-model-editor-v${env.version}-mac.zip'"
-                    sh "unzip -o aspect-model-editor-v${env.version}-mac.zip -d unpack_dir"
+                        --output '${macOsFile}'"
+                    sh "unzip -o ame-backend-v${env.version}-mac.zip -d unpack_dir"
+                    sh "rm '${macOsFile}'"
                     sh "ls -a unpack_dir"
                 }
             }
@@ -112,7 +116,7 @@ pipeline {
 
                     sh "rm '${macOsFile}'"
 
-                    sh "curl -JO -o ame-backend-${env.version}-mac.zip https://cbi.eclipse.org/macos/xcrun/${uuid}/download"
+                    sh "curl -JO -o ame-backend-v${env.version}-mac.zip https://cbi.eclipse.org/macos/xcrun/${uuid}/download"
                 }
             }
         }
@@ -122,8 +126,8 @@ pipeline {
                 script {
                     def repo = "eclipse-esmf/esmf-aspect-model-editor-backend"
                     def tagName = "v${env.version}"
-                    def fileNameWin = "aspect-model-editor-v${env.version}-win.zip"
-                    def fileNameMac = "ame-backend-${env.version}-mac.zip"
+                    def fileNameWin = "ame-backend-v${env.version}-win.zip"
+                    def fileNameMac = "ame-backend-v${env.version}-mac.zip"
                     def releaseId = ""
 
                     def tagExists = sh(script: """