Skip to content

Commit e1a9d7f

Browse files
authored
remove the stable/ target altogether (#923)
1 parent e19539f commit e1a9d7f

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

Jenkinsfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ pipeline {
1111
booleanParam(name: 'MINGW32', defaultValue: false, description: 'Build with MINGW32')
1212
booleanParam(name: 'SUBMODULE_UPDATE', defaultValue: false, description: 'Allow pull request to update submodules (disabled by default due to common user errors)')
1313
booleanParam(name: 'UPLOAD_BUILD_OPENMODELICA', defaultValue: false, description: 'Upload install artifacts to build.openmodelica.org/omsimulator. Activates MINGW32 as well.')
14-
booleanParam(name: 'STABLE', defaultValue: false, description: 'ONLY for releases - upload install artifacts to build.openmodelica.org/omsimulator/stable/')
1514
string(name: 'RUNTESTS_FLAG', defaultValue: '', description: 'runtests.pl flag')
1615
}
1716
stages {
@@ -677,7 +676,6 @@ EXIT /b 1
677676
)
678677
}
679678
}
680-
681679
}
682680
}
683681

@@ -785,9 +783,6 @@ def getDeploymentPrefix() {
785783
if (isPR()) {
786784
return "experimental/pr-${env.CHANGE_ID}/"
787785
}
788-
if (params.STABLE) {
789-
return "stable/"
790-
}
791786
return "nightly/"
792787
}
793788

src/pip/setup.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,19 @@ def fetch_oms(self):
6363

6464
# download the zip directory from url
6565
if (sysconfig.get_platform() == 'linux-x86_64'):
66-
response = requests.get('https://build.openmodelica.org/omsimulator/@OMS_BUILD_TYPE@/linux-amd64/OMSimulator-linux-amd64-@OMS_VERSION_STRING@.tar.gz')
66+
response = requests.get('https://build.openmodelica.org/omsimulator/nightly/linux-amd64/OMSimulator-linux-amd64-@OMS_VERSION_STRING@.tar.gz')
6767
elif (sysconfig.get_platform() == 'linux-i386'):
68-
response = requests.get('https://build.openmodelica.org/omsimulator/@OMS_BUILD_TYPE@/linux-i386/OMSimulator-linux-i386-@OMS_VERSION_STRING@.tar.gz')
68+
response = requests.get('https://build.openmodelica.org/omsimulator/nightly/linux-i386/OMSimulator-linux-i386-@OMS_VERSION_STRING@.tar.gz')
6969
elif (sysconfig.get_platform() == 'linux-arm32'):
70-
response = requests.get('https://build.openmodelica.org/omsimulator/@OMS_BUILD_TYPE@/linux-arm32/OMSimulator-linux-arm32-@OMS_VERSION_STRING@.tar.gz')
70+
response = requests.get('https://build.openmodelica.org/omsimulator/nightly/linux-arm32/OMSimulator-linux-arm32-@OMS_VERSION_STRING@.tar.gz')
7171
elif (sysconfig.get_platform() == 'mingw' and platform.architecture()[0] == '64bit'):
72-
response = requests.get('https://build.openmodelica.org/omsimulator/@OMS_BUILD_TYPE@/win-mingw64/OMSimulator-mingw64-@OMS_VERSION_STRING@.zip')
72+
response = requests.get('https://build.openmodelica.org/omsimulator/nightly/win-mingw64/OMSimulator-mingw64-@OMS_VERSION_STRING@.zip')
7373
elif (sysconfig.get_platform() == 'mingw' and platform.architecture()[0] == '32bit'):
74-
response = requests.get('https://build.openmodelica.org/omsimulator/@OMS_BUILD_TYPE@/win-mingw32/OMSimulator-mingw32-@OMS_VERSION_STRING@.zip')
74+
response = requests.get('https://build.openmodelica.org/omsimulator/nightly/win-mingw32/OMSimulator-mingw32-@OMS_VERSION_STRING@.zip')
7575
elif (sysconfig.get_platform() == 'win-amd64'):
76-
response = requests.get('https://build.openmodelica.org/omsimulator/@OMS_BUILD_TYPE@/win-msvc64/OMSimulator-win64-@OMS_VERSION_STRING@.zip')
76+
response = requests.get('https://build.openmodelica.org/omsimulator/nightly/win-msvc64/OMSimulator-win64-@OMS_VERSION_STRING@.zip')
7777
elif (platform.system() == 'Darwin'):
78-
response = requests.get('https://build.openmodelica.org/omsimulator/@OMS_BUILD_TYPE@/osx/OMSimulator-osx-@OMS_VERSION_STRING@.zip')
78+
response = requests.get('https://build.openmodelica.org/omsimulator/nightly/osx/OMSimulator-osx-@OMS_VERSION_STRING@.zip')
7979
else:
8080
raise Exception("Platform not supported for {} ".format(sysconfig.get_platform()))
8181

0 commit comments

Comments
 (0)