Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.0.0 #43

Closed
wants to merge 11 commits into from
Closed

v1.0.0 #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
73cf1d5
Bump to dev version
Croydon Oct 26, 2022
94efe6d
Matrix: Remove Clang < 10
Croydon Oct 26, 2022
15b95ac
Extend usage of modern containers + use ubuntu18.04 base
Croydon Oct 26, 2022
069820c
Matrix: Remove GCC 4.9
Croydon Oct 26, 2022
c4aa481
Matrix: Remove Apple Clang 10
Croydon Oct 26, 2022
a7d0f0a
Matrix: Add Clang 13
Croydon Oct 26, 2022
f947a63
Matrix: Update CI runner image to Ubuntu 20.04
Croydon Oct 26, 2022
2ebc9fe
Bump actions/checkout from 3 to 4
dependabot[bot] Sep 11, 2023
4531881
Merge pull request #44 from bincrafters/dependabot/github_actions/act…
ericLemanissier Sep 11, 2023
82e086d
Bump actions/setup-python from 4 to 5
dependabot[bot] Dec 11, 2023
be53de5
Merge pull request #45 from bincrafters/dependabot/github_actions/act…
ericLemanissier Dec 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/package-tools.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ jobs:
matrix:
os: ["ubuntu-20.04", "windows-2019", "macos-10.15"]
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.8"
- name: "Build & Test"
Expand All @@ -33,8 +33,8 @@ jobs:
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
needs: bincrafters-package-tools-test
steps:
- uses: actions/checkout@v3
- uses: actions/setup-python@v4
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: "3.8"
- name: Build
Expand Down
2 changes: 1 addition & 1 deletion bincrafters/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.33.0'
__version__ = '1.0.0-alpha1'
38 changes: 15 additions & 23 deletions bincrafters/generate_ci_jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,40 +61,33 @@ def _get_base_config(recipe_directory: str, platform: str, split_by_build_types:
run_windows = _run_windows_jobs_on_gha()
if recipe_type == "installer":
matrix["config"] = [
{"name": "Installer Linux", "compiler": "GCC", "version": "7", "os": "ubuntu-18.04", "dockerImage": "conanio/gcc7"},
{"name": "Installer Linux", "compiler": "GCC", "version": "7", "os": "ubuntu-20.04", "dockerImage": "conanio/gcc7"},
{"name": "Installer Windows", "compiler": "VISUAL", "version": "16", "os": "windows-2019"},
{"name": "Installer macOS", "compiler": "APPLE_CLANG", "version": "11.0", "os": "macos-10.15"}
]
matrix_minimal["config"] = matrix["config"].copy()
elif recipe_type == "unconditional_header_only":
matrix["config"] = [
{"name": "Header-only Linux", "compiler": "CLANG", "version": "8", "os": "ubuntu-18.04"},
{"name": "Header-only Linux", "compiler": "CLANG", "version": "8", "os": "ubuntu-20.04"},
{"name": "Header-only Windows", "compiler": "VISUAL", "version": "16", "os": "windows-latest"}
]
matrix_minimal["config"] = matrix["config"].copy()
else:
matrix["config"] = [
{"name": "GCC 4.9", "compiler": "GCC", "version": "4.9", "os": "ubuntu-18.04"},
{"name": "GCC 5", "compiler": "GCC", "version": "5", "os": "ubuntu-18.04"},
{"name": "GCC 6", "compiler": "GCC", "version": "6", "os": "ubuntu-18.04"},
{"name": "GCC 7", "compiler": "GCC", "version": "7", "os": "ubuntu-18.04"},
{"name": "GCC 8", "compiler": "GCC", "version": "8", "os": "ubuntu-18.04"},
{"name": "GCC 9", "compiler": "GCC", "version": "9", "os": "ubuntu-18.04"},
{"name": "GCC 10", "compiler": "GCC", "version": "10", "os": "ubuntu-18.04"},
{"name": "GCC 11", "compiler": "GCC", "version": "11", "os": "ubuntu-18.04"},
{"name": "CLANG 4.0", "compiler": "CLANG", "version": "4.0", "os": "ubuntu-18.04"},
{"name": "CLANG 5.0", "compiler": "CLANG", "version": "5.0", "os": "ubuntu-18.04"},
{"name": "CLANG 6.0", "compiler": "CLANG", "version": "6.0", "os": "ubuntu-18.04"},
{"name": "CLANG 7.0", "compiler": "CLANG", "version": "7.0", "os": "ubuntu-18.04"},
{"name": "CLANG 8", "compiler": "CLANG", "version": "8", "os": "ubuntu-18.04"},
{"name": "CLANG 9", "compiler": "CLANG", "version": "9", "os": "ubuntu-18.04"},
{"name": "CLANG 10", "compiler": "CLANG", "version": "10", "os": "ubuntu-18.04"},
{"name": "CLANG 11", "compiler": "CLANG", "version": "11", "os": "ubuntu-18.04"},
{"name": "CLANG 12", "compiler": "CLANG", "version": "12", "os": "ubuntu-18.04"},
{"name": "GCC 5", "compiler": "GCC", "version": "5", "os": "ubuntu-20.04"},
{"name": "GCC 6", "compiler": "GCC", "version": "6", "os": "ubuntu-20.04"},
{"name": "GCC 7", "compiler": "GCC", "version": "7", "os": "ubuntu-20.04"},
{"name": "GCC 8", "compiler": "GCC", "version": "8", "os": "ubuntu-20.04"},
{"name": "GCC 9", "compiler": "GCC", "version": "9", "os": "ubuntu-20.04"},
{"name": "GCC 10", "compiler": "GCC", "version": "10", "os": "ubuntu-20.04"},
{"name": "GCC 11", "compiler": "GCC", "version": "11", "os": "ubuntu-20.04"},
{"name": "CLANG 10", "compiler": "CLANG", "version": "10", "os": "ubuntu-20.04"},
{"name": "CLANG 11", "compiler": "CLANG", "version": "11", "os": "ubuntu-20.04"},
{"name": "CLANG 12", "compiler": "CLANG", "version": "12", "os": "ubuntu-20.04"},
{"name": "CLANG 13", "compiler": "CLANG", "version": "13", "os": "ubuntu-20.04"},
]
if run_macos:
matrix["config"] += [
{"name": "macOS Apple-Clang 10", "compiler": "APPLE_CLANG", "version": "10.0", "os": "macOS-10.15"},
{"name": "macOS Apple-Clang 11", "compiler": "APPLE_CLANG", "version": "11.0", "os": "macOS-10.15"},
{"name": "macOS Apple-Clang 12", "compiler": "APPLE_CLANG", "version": "11.0", "os": "macOS-10.15"},
]
Expand All @@ -104,8 +97,8 @@ def _get_base_config(recipe_directory: str, platform: str, split_by_build_types:
# {"name": "Windows VS 2022 - Testing", "compiler": "VISUAL", "version": "17", "os": "windows-2022"},
]
matrix_minimal["config"] = [
{"name": "GCC 7", "compiler": "GCC", "version": "7", "os": "ubuntu-18.04"},
{"name": "CLANG 8", "compiler": "CLANG", "version": "8", "os": "ubuntu-18.04"},
{"name": "GCC 7", "compiler": "GCC", "version": "7", "os": "ubuntu-20.04"},
{"name": "CLANG 10", "compiler": "CLANG", "version": "10", "os": "ubuntu-20.04"},
]
if run_macos:
matrix_minimal["config"] += [
Expand All @@ -121,7 +114,6 @@ def _get_base_config(recipe_directory: str, platform: str, split_by_build_types:
matrix_minimal["config"] = []
else:
matrix["config"] = [
{"name": "macOS Apple-Clang 10", "compiler": "APPLE_CLANG", "version": "10.0", "os": "macOS-10.15"},
{"name": "macOS Apple-Clang 11", "compiler": "APPLE_CLANG", "version": "11.0", "os": "macOS-10.15"},
{"name": "macOS Apple-Clang 12", "compiler": "APPLE_CLANG", "version": "12.0", "os": "macOS-10.15"},
{"name": "Windows VS 2019", "compiler": "VISUAL", "version": "16", "os": "windows-2019"},
Expand Down
7 changes: 2 additions & 5 deletions bincrafters/prepare_env.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,9 @@ def _set_env_variable(var_name: str, value: str):
version_without_dot = compiler_version.replace(".", "")
image_suffix = ""
# Use "modern" CDT containers for newer compilers
if (compiler == "GCC" and float(compiler_version) >= 12) or \
(compiler == "CLANG" and float(compiler_version) >= 14):
if (compiler == "GCC" and float(compiler_version) >= 11) or \
(compiler == "CLANG" and float(compiler_version) >= 10):
image_suffix = "-ubuntu18.04"
elif (compiler == "GCC" and float(compiler_version) >= 11) or \
(compiler == "CLANG" and float(compiler_version) >= 12):
image_suffix = "-ubuntu16.04"

docker_image = "conanio/{}{}{}".format(compiler_lower, version_without_dot, image_suffix)
_set_env_variable("CONAN_DOCKER_IMAGE", docker_image)
Expand Down
Loading