Skip to content

Commit

Permalink
Remove block to deploy to bintray
Browse files Browse the repository at this point in the history
Bintray is scheduled to sunset on May 1 2021
Sad, to see it go!
  • Loading branch information
bernedom committed Apr 28, 2021
1 parent 547ba61 commit e9a3c54
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 54 deletions.
31 changes: 0 additions & 31 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,34 +114,3 @@ jobs:
run: |
git fetch --tags --force
./test/version-consistency.sh
deploy-to-bintray:
needs: version-consistency-check
runs-on: ubuntu-18.04

steps:
- uses: actions/checkout@v2

- name: dependencies
run: |
sudo apt install shunit2 python3-setuptools python3-pip -y
sudo pip3 install conan
- name: set-environment
run: |
echo "CONAN_LOGIN_USERNAME=${{ secrets.CONAN_USERNAME }}" >> $GITHUB_ENV
echo "CONAN_PASSWORD=${{ secrets.CONAN_PASSWORD }}" >> $GITHUB_ENV
- name: deploy-unstable
if: github.event.action != 'published' && github.event_name != 'pull_request' && github.ref == 'refs/heads/main'
run: |
conan remote add bernedom https://api.bintray.com/conan/bernedom/conan
conan create . SI/unstable
conan upload SI/*@SI/unstable --all -c -r bernedom
- name: deploy-stable
if: github.event.action == 'published'
run: |
conan remote add bernedom https://api.bintray.com/conan/bernedom/conan
conan create . SI/stable
conan upload SI/*@SI/stable --all -c -r bernedom
2 changes: 1 addition & 1 deletion .lgtm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ extraction:
- export PATH=$PATH:~/.local/bin
- conan --version
- conan profile new default --detect
- conan remote update conan-center https://conan.bintray.com False
- conan remote update conan-center https://conan.io/center False
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
## 2.1.2

* Update to catch 2.13.6 in the conan recipes
* Remove deployment to bintray.com as it is scheduled to sunset on May 1 2021

## 2.1.1

Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

[![GitHub Releases](https://img.shields.io/github/release/bernedom/SI.svg)](https://github.com/bernedom/SI/releases)
[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/bernedom/SI/master/LICENSE)
[![Download](https://api.bintray.com/packages/bernedom/conan/si%3ASI/images/download.svg)](https://bintray.com/bernedom/conan/si%3ASI/_latestVersion)

# SI - Type safety for physical units

Expand Down Expand Up @@ -129,7 +128,7 @@ substitute `--config Debug` with `--config Release` for optimized builds

### Installing

The default installation location for SI is `/usr/local/lib/SI`. SI can be installed using raw cmake, cpack (cmakes package mechanism), or as a conan.io package provided from [Bintray](https://bintray.com/bernedom/conan/si%3ASI)
The default installation location for SI is `/usr/local/lib/SI`. SI can be installed using raw cmake, cpack (cmakes package mechanism), or as a conan.io package provided from [conan center](https://conan.io/center/si/)

See [the installation guide](doc/installation-guide.md) for detailed instructions

Expand Down
11 changes: 6 additions & 5 deletions conanfile.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
from conans import ConanFile, CMake
from conans.tools import load
import re, os
import re
import os


class SiConan(ConanFile):

name = "si"
license = "MIT"
url = "https://bintray.com/beta/#/bernedom/conan/si:si"
url = "https://conan.io/center/si/"
homepage = "https://github.com/bernedom/SI"
description = "A header only c++ library that provides type safety and user defined literals \
for handling pyhsical values defined in the International System of Units."
Expand All @@ -28,10 +29,10 @@ def _configure_cmake(self):

def set_version(self):
cmake = load(os.path.join(self.recipe_folder, "CMakeLists.txt"))

version = re.search(r"(?:[ \t]*)(?:VERSION\s+?)(\d+\.\d+\.\d+)", cmake).group(1)
self.version = version

version = re.search(
r"(?:[ \t]*)(?:VERSION\s+?)(\d+\.\d+\.\d+)", cmake).group(1)
self.version = version

def build(self):
cmake = self._configure_cmake()
Expand Down
16 changes: 1 addition & 15 deletions doc/installation-guide.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Installing `SI`

The default installation location for SI is `/usr/local/lib/si`. SI can be installed using raw cmake, cpack (cmakes package mechanism), or as a conan.io package provided from [conan center](https://conan.io/center/si). Early access to conan packages for unstable versions is available from [Bintray](https://bintray.com/bernedom/conan/si%3ASI)
The default installation location for SI is `/usr/local/lib/si`. SI can be installed using raw cmake, cpack (cmakes package mechanism), or as a conan.io package provided from [conan center](https://conan.io/center/si).

## Installing using cmake

Expand Down Expand Up @@ -48,20 +48,6 @@ Use the following in your `conanfile.txt`
si/[>1.0 <2.0]@SI/stable
```

### Early access and nightly builds

For nightly builds and early access to versions use the custom repository https://api.bintray.com/conan/bernedom/conan

```bash
conan remote add bernedom https://api.bintray.com/conan/bernedom/conan
```
In the `conanfile.txt` SI is added like this, to ensure to get the latest version.

```
[requires]
si/[>1.0 <2.0]@SI/stable
```

`SI/stable` are release builds and are considered usable.
Use `SI/unstable` to get the latest development builds. See the [official conan documentation](https://docs.conan.io/en/latest/integrations/build_system/cmake/cmake_generator.html) on how to integrate the package into your cmake project.

Expand Down

3 comments on commit e9a3c54

@bernedom
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'Catch2 Benchmark'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.0.

Benchmark suite Current: e9a3c54 Previous: d4ead6a Ratio
Default construction 0.276303 ns (+/- 0.133869) 0 ns (+/- 0) Infinity
Value initialized construction 0.469872 ns (+/- 0.597024) 0 ns (+/- 0) Infinity
copy construction same ratio 0.382397 ns (+/- 0.269356) 0 ns (+/- 0) Infinity
copy construction different ratio 0.337641 ns (+/- 0.17554) 0 ns (+/- 0) Infinity

This comment was automatically generated by workflow using github-action-benchmark.

CC: @bernedom

@bernedom
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'Catch2 Benchmark'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.0.

Benchmark suite Current: e9a3c54 Previous: d4ead6a Ratio
Default construction 0.149605 ns (+/- 0.0390852) 0 ns (+/- 0) Infinity
Value initialized construction 0.302329 ns (+/- 0.0175445) 0 ns (+/- 0) Infinity
copy construction same ratio 0.252569 ns (+/- 0.00366634) 0 ns (+/- 0) Infinity
copy construction different ratio 0.251909 ns (+/- 0.0346596) 0 ns (+/- 0) Infinity

This comment was automatically generated by workflow using github-action-benchmark.

CC: @bernedom

@bernedom
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Performance Alert ⚠️

Possible performance regression was detected for benchmark 'Catch2 Benchmark'.
Benchmark result of this commit is worse than the previous benchmark result exceeding threshold 2.0.

Benchmark suite Current: e9a3c54 Previous: d4ead6a Ratio
Default construction 0.25314 ns (+/- 0.174569) 0 ns (+/- 0) Infinity
Value initialized construction 0.279702 ns (+/- 0.387745) 0 ns (+/- 0) Infinity
copy construction same ratio 0.263776 ns (+/- 0.164707) 0 ns (+/- 0) Infinity
copy construction different ratio 0.301576 ns (+/- 0.305833) 0 ns (+/- 0) Infinity

This comment was automatically generated by workflow using github-action-benchmark.

CC: @bernedom

Please sign in to comment.