Skip to content

Commit 7db0525

Browse files
authored
Merge pull request ERGO-Code#2090 from ERGO-Code/version-bump
Version bump
2 parents efa50c5 + f41a161 commit 7db0525

File tree

15 files changed

+65
-62
lines changed

15 files changed

+65
-62
lines changed

.github/workflows/build-nuget-package.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ jobs:
185185

186186
- name: Dotnet pack
187187
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
188-
run: dotnet pack -c Release /p:Version=1.8.1
188+
run: dotnet pack -c Release /p:Version=1.9.0
189189

190190
- uses: actions/upload-artifact@v4
191191
with:

.github/workflows/build-wheels-push.yml

Lines changed: 39 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
name: build-wheels-push
22

3+
on: []
34
# on: push
45

5-
on:
6-
release:
7-
types:
8-
- published
6+
# on:
7+
# release:
8+
# types:
9+
# - published
910

1011
concurrency:
1112
group: ${{ github.workflow }}-${{ github.ref }}
@@ -81,51 +82,22 @@ jobs:
8182
name: cibw-wheels-${{ matrix.python }}-${{ matrix.buildplat[1] }}
8283
path: wheelhouse/*.whl
8384

84-
# upload_testpypi:
85-
# name: >-
86-
# Publish highspy to TestPyPI
87-
# runs-on: ubuntu-latest
88-
# needs: [build_wheels, build_sdist]
89-
# # needs: [build_sdist]
90-
91-
# # upload to PyPI on every tag starting with 'v'
92-
# # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
93-
94-
# environment:
95-
# name: testpypi
96-
# url: https://test.pypi.org/p/highspy
97-
98-
# permissions:
99-
# id-token: write # IMPORTANT: mandatory for trusted publishing
100-
# steps:
101-
# - uses: actions/download-artifact@v4
102-
# with:
103-
# pattern: cibw-*
104-
# path: dist
105-
# merge-multiple: true
106-
107-
# - name: Download all
108-
# uses: pypa/gh-action-pypi-publish@release/v1
109-
# with:
110-
# repository-url: https://test.pypi.org/legacy/
111-
# verbose: true
112-
113-
upload_pypi:
85+
upload_testpypi:
11486
name: >-
115-
Publish highspy to PyPI
87+
Publish highspy to TestPyPI
11688
runs-on: ubuntu-latest
11789
needs: [build_wheels, build_sdist]
90+
# needs: [build_sdist]
11891

11992
# upload to PyPI on every tag starting with 'v'
12093
# if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
12194

12295
environment:
123-
name: pypi
124-
url: https://pypi.org/p/highspy
96+
name: testpypi
97+
url: https://test.pypi.org/p/highspy
12598

12699
permissions:
127100
id-token: write # IMPORTANT: mandatory for trusted publishing
128-
129101
steps:
130102
- uses: actions/download-artifact@v4
131103
with:
@@ -135,3 +107,32 @@ jobs:
135107

136108
- name: Download all
137109
uses: pypa/gh-action-pypi-publish@release/v1
110+
with:
111+
repository-url: https://test.pypi.org/legacy/
112+
verbose: true
113+
114+
# upload_pypi:
115+
# name: >-
116+
# Publish highspy to PyPI
117+
# runs-on: ubuntu-latest
118+
# needs: [build_wheels, build_sdist]
119+
120+
# # upload to PyPI on every tag starting with 'v'
121+
# # if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
122+
123+
# environment:
124+
# name: pypi
125+
# url: https://pypi.org/p/highspy
126+
127+
# permissions:
128+
# id-token: write # IMPORTANT: mandatory for trusted publishing
129+
130+
# steps:
131+
# - uses: actions/download-artifact@v4
132+
# with:
133+
# pattern: cibw-*
134+
# path: dist
135+
# merge-multiple: true
136+
137+
# - name: Download all
138+
# uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/test-nuget-macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Dotnet pack
3737
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
38-
run: dotnet pack -c Release /p:Version=1.8.1
38+
run: dotnet pack -c Release /p:Version=1.9.0
3939

4040
- name: Add local feed
4141
run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -80,7 +80,7 @@ jobs:
8080

8181
- name: Dotnet pack
8282
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
83-
run: dotnet pack -c Release /p:Version=1.8.1
83+
run: dotnet pack -c Release /p:Version=1.9.0
8484

8585
- name: Add local feed
8686
run: dotnet nuget add source ${{runner.workspace}}/nugets

.github/workflows/test-nuget-package.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Dotnet pack
3737
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
38-
run: dotnet pack -c Release /p:Version=1.8.1
38+
run: dotnet pack -c Release /p:Version=1.9.0
3939

4040
- name: Add local feed
4141
run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -81,7 +81,7 @@ jobs:
8181

8282
- name: Dotnet pack
8383
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
84-
run: dotnet pack -c Release /p:Version=1.8.1
84+
run: dotnet pack -c Release /p:Version=1.9.0
8585

8686
- name: Add local feed
8787
run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -124,7 +124,7 @@ jobs:
124124

125125
- name: Dotnet pack
126126
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
127-
run: dotnet pack -c Release /p:Version=1.8.1
127+
run: dotnet pack -c Release /p:Version=1.9.0
128128

129129
- name: Add local feed
130130
run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -167,7 +167,7 @@ jobs:
167167

168168
- name: Dotnet pack
169169
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
170-
run: dotnet pack -c Release /p:Version=1.8.1
170+
run: dotnet pack -c Release /p:Version=1.9.0
171171

172172
- name: Add local feed
173173
run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -212,7 +212,7 @@ jobs:
212212

213213
- name: Dotnet pack
214214
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
215-
run: dotnet pack -c Release /p:Version=1.8.1
215+
run: dotnet pack -c Release /p:Version=1.9.0
216216

217217
- name: Add local feed
218218
run: dotnet nuget add source -n name ${{runner.workspace}}\nugets
@@ -228,5 +228,5 @@ jobs:
228228
dotnet new console
229229
rm Program.cs
230230
cp ${{runner.workspace}}\HiGHS\examples\call_highs_from_csharp.cs .
231-
dotnet add package Highs.Native -v 1.8.1 -s ${{runner.workspace}}\nugets
231+
dotnet add package Highs.Native -v 1.9.0 -s ${{runner.workspace}}\nugets
232232
dotnet run

.github/workflows/test-nuget-ubuntu.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
- name: Dotnet pack
3333
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
34-
run: dotnet pack -c Release /p:Version=1.8.1
34+
run: dotnet pack -c Release /p:Version=1.9.0
3535

3636
- name: Add local feed
3737
run: dotnet nuget add source ${{runner.workspace}}/nugets
@@ -74,7 +74,7 @@ jobs:
7474

7575
- name: Dotnet pack
7676
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
77-
run: dotnet pack -c Release /p:Version=1.8.1
77+
run: dotnet pack -c Release /p:Version=1.9.0
7878

7979
- name: Add local feed
8080
run: dotnet nuget add source ${{runner.workspace}}/nugets

.github/workflows/test-nuget-win.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333

3434
- name: Dotnet pack
3535
working-directory: ${{runner.workspace}}/build/dotnet/Highs.Native
36-
run: dotnet pack -c Release /p:Version=1.8.1
36+
run: dotnet pack -c Release /p:Version=1.9.0
3737

3838
- name: Add local feed
3939
run: dotnet nuget add source -n name ${{runner.workspace}}\nugets
@@ -49,5 +49,5 @@ jobs:
4949
dotnet new console
5050
rm Program.cs
5151
cp ${{runner.workspace}}\HiGHS\examples\call_highs_from_csharp.cs .
52-
dotnet add package Highs.Native -v 1.8.1 -s ${{runner.workspace}}\nugets
52+
dotnet add package Highs.Native -v 1.9.0 -s ${{runner.workspace}}\nugets
5353
dotnet run

FEATURES.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
## Build changes
22

3+
Python: Source Distribution update, added to PyPI
4+
35
## Code changes
46

57
HiGHS now handles multiple linear objectives by either blending using weights, or performing lexicographic optimization: see https://ergo-code.github.io/HiGHS/stable/guide/further/#guide-multi-objective-optimization

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"""
33
module(
44
name = "highs",
5-
version = "1.8.1",
5+
version = "1.9.0",
66
)
77

88
bazel_dep(

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ The nuget package Highs.Native is on https://www.nuget.org, at https://www.nuget
208208
It can be added to your C# project with `dotnet`
209209

210210
```shell
211-
dotnet add package Highs.Native --version 1.8.1
211+
dotnet add package Highs.Native --version 1.9.0
212212
```
213213

214214
The nuget package contains runtime libraries for

Version.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
HIGHS_MAJOR=1
2-
HIGHS_MINOR=8
3-
HIGHS_PATCH=1
2+
HIGHS_MINOR=9
3+
HIGHS_PATCH=0
44
#PRE_RELEASE=YES

0 commit comments

Comments
 (0)