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

Jump to bottom

Disable uploads for build types that we are not using in CI or development #249

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Disable uploads for build types that we are not using in CI or development #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
41a3202
Disable uploads for build types that we are not using in CI or develo…
mbautin Nov 3, 2023
4faeccc
Fix typo
mbautin Nov 3, 2023
18b13a2
Change OpenSSL version to 3.0.8 (#248)
es1024 Nov 3, 2023
644f467
[skip ci] Manually install hub for macOS builds (#251)
es1024 Nov 7, 2023
92b12af
Fix upload flags
mbautin Nov 7, 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
29 changes: 26 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ jobs:
build_thirdparty_args: >-
--devtoolset=11
--expected-major-compiler-version=11
upload: true

# Clang 16
- name: centos7-x86_64-clang16
Expand All @@ -62,6 +63,7 @@ jobs:
build_thirdparty_args: >-
--toolchain=llvm16
--expected-major-compiler-version=16
upload: true

- name: centos7-x86_64-clang16-full-lto
os: ubuntu-20.04 # Ubuntu 20.04 is for the top-level VM only. We use Docker in it.
Expand All @@ -70,6 +72,8 @@ jobs:
--toolchain=llvm16
--expected-major-compiler-version=16
--lto=full
--skip-sanitizers
upload: true

# Clang 17
- name: centos7-x86_64-clang17
Expand All @@ -78,6 +82,7 @@ jobs:
build_thirdparty_args: >-
--toolchain=llvm17
--expected-major-compiler-version=17
upload: true

- name: centos7-x86_64-clang17-full-lto
os: ubuntu-20.04 # Ubuntu 20.04 is for the top-level VM only. We use Docker in it.
Expand All @@ -86,6 +91,8 @@ jobs:
--toolchain=llvm17
--expected-major-compiler-version=17
--lto=full
--skip-sanitizers
upload: true

# ---------------------------------------------------------------------------------------
# Ubuntu 20.04
Expand All @@ -96,6 +103,7 @@ jobs:
build_thirdparty_args: >-
--toolchain=llvm16
--expected-major-compiler-version=16
upload: true

# ---------------------------------------------------------------------------------------
# Ubuntu 22.04
Expand All @@ -109,20 +117,25 @@ jobs:
--compiler-family=gcc
--compiler-suffix=-11
--expected-major-compiler-version=11
# We can use the CentOS 7 GCC 11 build on Ubuntu 22.04, no need to upload.
upload: false

- name: ubuntu2204-x86_64-clang16
os: ubuntu-20.04 # Ubuntu 20.04 is for the top-level VM only. We use Docker in it.
docker_image: yugabyteci/yb_build_infra_ubuntu2204_x86_64:v2023-10-25T03_33_00
build_thirdparty_args: >-
--toolchain=llvm16
--expected-major-compiler-version=16
upload: true

- name: ubuntu2204-x86_64-clang17
os: ubuntu-20.04 # Ubuntu 20.04 is for the top-level VM only. We use Docker in it.
docker_image: yugabyteci/yb_build_infra_ubuntu2204_x86_64:v2023-10-25T03_33_00
build_thirdparty_args: >-
--toolchain=llvm17
--expected-major-compiler-version=17
# We can use the CentOS 7 Clang 17 build on Ubuntu 22.04, no need to upload.
upload: true

# ---------------------------------------------------------------------------------------
# AlmaLinux 8
Expand All @@ -134,6 +147,8 @@ jobs:
build_thirdparty_args: >-
--devtoolset=11
--expected-major-compiler-version=11
# We can use the CentOS 7 GCC 11 build on AlmaLinux 8.
upload: false

# Clang/LLVM 16
- name: almalinux8-x86_64-clang16
Expand All @@ -142,6 +157,7 @@ jobs:
build_thirdparty_args: >-
--toolchain=llvm16
--expected-major-compiler-version=16
upload: true

# Clang/LLVM 17
- name: almalinux8-x86_64-clang17
Expand All @@ -150,6 +166,7 @@ jobs:
build_thirdparty_args: >-
--toolchain=llvm17
--expected-major-compiler-version=17
upload: true

# ---------------------------------------------------------------------------------------
# Ubuntu 23.04
Expand All @@ -163,6 +180,7 @@ jobs:
--compiler-suffix=-13
--compiler-family=gcc
--expected-major-compiler-version=13
upload: true

# ---------------------------------------------------------------------------------------
# AlmaLinux 9
Expand All @@ -174,20 +192,23 @@ jobs:
build_thirdparty_args: >-
--devtoolset=12
--expected-major-compiler-version=12
upload: true

- name: almalinux9-x86_64-clang16
os: ubuntu-20.04 # Ubuntu 20.04 is for the top-level VM only. We use Docker in it.
docker_image: yugabyteci/yb_build_infra_almalinux9_x86_64:v2023-10-25T03_33_02
build_thirdparty_args: >-
--toolchain=llvm16
--expected-major-compiler-version=16
upload: true

- name: almalinux9-x86_64-clang17
os: ubuntu-20.04 # Ubuntu 20.04 is for the top-level VM only. We use Docker in it.
docker_image: yugabyteci/yb_build_infra_almalinux9_x86_64:v2023-10-25T03_33_02
build_thirdparty_args: >-
--toolchain=llvm17
--expected-major-compiler-version=17
upload: true

# ---------------------------------------------------------------------------------------
# macOS
Expand All @@ -197,6 +218,7 @@ jobs:
os: macos-12
docker_image:
build_thirdparty_args:
upload: true

steps:
- name: Increase disk space
Expand All @@ -216,11 +238,12 @@ jobs:
- name: Build
run: .github/workflows/github_actions_build.sh
env:
YB_DOCKER_IMAGE: ${{ matrix.docker_image }}
YB_THIRDPARTY_ARCHIVE_NAME_SUFFIX: ${{ matrix.name }}
YB_BUILD_THIRDPARTY_ARGS: ${{ matrix.build_thirdparty_args }}
GITHUB_TOKEN: ${{ secrets.CUSTOM_GITHUB_TOKEN }}
SNYK_TOKEN: ${{ secrets.SNYK_AUTH_TOKEN }}
YB_BUILD_THIRDPARTY_ARGS: ${{ matrix.build_thirdparty_args }}
YB_DOCKER_IMAGE: ${{ matrix.docker_image }}
YB_THIRDPARTY_ARCHIVE_NAME_SUFFIX: ${{ matrix.name }}
YB_UPLOAD_THIRDPARTY_ARCHIVE: ${{ matrix.upload }}

- uses: actions/upload-artifact@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/macos_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -euo pipefail

brew install autoconf automake pkg-config shellcheck
brew install autoconf automake pkg-config shellcheck hub
dirs=( /opt/yb-build/{thirdparty,brew,tmp} )
sudo mkdir -p "${dirs[@]}"
sudo chmod 777 "${dirs[@]}"
Expand Down
5 changes: 4 additions & 1 deletion build_and_release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ if [[ -n ${GITHUB_TOKEN:-} &&
( set -x; hub issue -L 0 )
else
log "GITHUB_TOKEN length is ${#GITHUB_TOKEN} characters (not 40), considering it as unset."
GITHUB_TOKEN=""
fi

# We intentionally don't escape variables here so they get split into multiple arguments.
Expand All @@ -246,8 +247,10 @@ fi
# shellcheck disable=SC2206
build_thirdparty_cmd_args=( $build_thirdparty_cmd_str )

if [[ -z ${YB_SKIP_UPLOAD:-} ]]; then
if [[ -n $GITHUB_TOKEN && ${YB_UPLOAD_THIRDPARTY_ARCHIVE:-} == "true" ]]; then
build_thirdparty_cmd_args+=( --upload-as-tag "$tag" )
else
echo "To enable package upload, set YB_UPLOAD_THIRDPARTY_ARCHIVE to true and set GITHUB_TOKEN."
fi

(
Expand Down
2 changes: 1 addition & 1 deletion python/build_definitions/openssl.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ class OpenSSLDependency(Dependency):
def __init__(self) -> None:
super(OpenSSLDependency, self).__init__(
name='openssl',
version='3.1.3',
version='3.0.8',
url_pattern='https://www.openssl.org/source/openssl-{0}.tar.gz',
build_group=BuildGroup.COMMON)
self.copy_sources = True
Expand Down
1 change: 1 addition & 0 deletions thirdparty_src_checksums.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ c48450d27524c2e5856997133e059e3cf9909241110a6e21ad278890ac425afc lz4-r130.tar.g
9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f openssl-1.1.1o.tar.gz
8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b openssl-1.1.1t.tar.gz
cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8 openssl-1.1.1w.tar.gz
6c13d2bf38fdf31eac3ce2a347073673f5d63263398f1f69d0df4a41253e4b3e openssl-3.0.8.tar.gz
f0316a2ebd89e7f2352976445458689f80302093788c466692fb2a188b2eacf6 openssl-3.1.3.tar.gz
0fdbefbdc2c154634728097e26de52a8210ed95cb032beb5f35da0a493cd5066 opentelemetry-cpp-1.9.0.tar.gz
464bc2b348e674a1a03142e403cbccb01be8655b6de0f8bfe733ea31fcd421be opentelemetry-proto-0.19.0.tar.gz
Expand Down
Loading