remove the stable/ target altogether (#923)

OpenModelica · Jan 28, 2021 · e1a9d7f · e1a9d7f
1 parent e19539f
commit e1a9d7f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -11,7 +11,6 @@ pipeline {
     booleanParam(name: 'MINGW32', defaultValue: false, description: 'Build with MINGW32')
     booleanParam(name: 'SUBMODULE_UPDATE', defaultValue: false, description: 'Allow pull request to update submodules (disabled by default due to common user errors)')
     booleanParam(name: 'UPLOAD_BUILD_OPENMODELICA', defaultValue: false, description: 'Upload install artifacts to build.openmodelica.org/omsimulator. Activates MINGW32 as well.')
-    booleanParam(name: 'STABLE', defaultValue: false, description: 'ONLY for releases - upload install artifacts to build.openmodelica.org/omsimulator/stable/')
     string(name: 'RUNTESTS_FLAG', defaultValue: '', description: 'runtests.pl flag')
   }
   stages {
@@ -677,7 +676,6 @@ EXIT /b 1
             )
           }
         }
-
       }
     }
 
@@ -785,9 +783,6 @@ def getDeploymentPrefix() {
   if (isPR()) {
     return "experimental/pr-${env.CHANGE_ID}/"
   }
-  if (params.STABLE) {
-    return "stable/"
-  }
   return "nightly/"
 }
 

diff --git a/src/pip/setup.py b/src/pip/setup.py
@@ -63,19 +63,19 @@ def fetch_oms(self):
 
     # download the zip directory from url
     if (sysconfig.get_platform() == 'linux-x86_64'):
-      response = requests.get('https://build.openmodelica.org/omsimulator/@OMS_BUILD_TYPE@/linux-amd64/OMSimulator-linux-amd64-@OMS_VERSION_STRING@.tar.gz')
+      response = requests.get('https://build.openmodelica.org/omsimulator/nightly/linux-amd64/OMSimulator-linux-amd64-@OMS_VERSION_STRING@.tar.gz')
     elif (sysconfig.get_platform() == 'linux-i386'):
-      response = requests.get('https://build.openmodelica.org/omsimulator/@OMS_BUILD_TYPE@/linux-i386/OMSimulator-linux-i386-@OMS_VERSION_STRING@.tar.gz')
+      response = requests.get('https://build.openmodelica.org/omsimulator/nightly/linux-i386/OMSimulator-linux-i386-@OMS_VERSION_STRING@.tar.gz')
     elif (sysconfig.get_platform() == 'linux-arm32'):
-      response = requests.get('https://build.openmodelica.org/omsimulator/@OMS_BUILD_TYPE@/linux-arm32/OMSimulator-linux-arm32-@OMS_VERSION_STRING@.tar.gz')
+      response = requests.get('https://build.openmodelica.org/omsimulator/nightly/linux-arm32/OMSimulator-linux-arm32-@OMS_VERSION_STRING@.tar.gz')
     elif (sysconfig.get_platform() == 'mingw' and platform.architecture()[0] == '64bit'):
-      response = requests.get('https://build.openmodelica.org/omsimulator/@OMS_BUILD_TYPE@/win-mingw64/OMSimulator-mingw64-@OMS_VERSION_STRING@.zip')
+      response = requests.get('https://build.openmodelica.org/omsimulator/nightly/win-mingw64/OMSimulator-mingw64-@OMS_VERSION_STRING@.zip')
     elif (sysconfig.get_platform() == 'mingw' and platform.architecture()[0] == '32bit'):
-      response = requests.get('https://build.openmodelica.org/omsimulator/@OMS_BUILD_TYPE@/win-mingw32/OMSimulator-mingw32-@OMS_VERSION_STRING@.zip')
+      response = requests.get('https://build.openmodelica.org/omsimulator/nightly/win-mingw32/OMSimulator-mingw32-@OMS_VERSION_STRING@.zip')
     elif (sysconfig.get_platform() == 'win-amd64'):
-      response = requests.get('https://build.openmodelica.org/omsimulator/@OMS_BUILD_TYPE@/win-msvc64/OMSimulator-win64-@OMS_VERSION_STRING@.zip')
+      response = requests.get('https://build.openmodelica.org/omsimulator/nightly/win-msvc64/OMSimulator-win64-@OMS_VERSION_STRING@.zip')
     elif (platform.system() == 'Darwin'):
-      response = requests.get('https://build.openmodelica.org/omsimulator/@OMS_BUILD_TYPE@/osx/OMSimulator-osx-@OMS_VERSION_STRING@.zip')
+      response = requests.get('https://build.openmodelica.org/omsimulator/nightly/osx/OMSimulator-osx-@OMS_VERSION_STRING@.zip')
     else:
       raise Exception("Platform not supported for {} ".format(sysconfig.get_platform()))