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

chore(*) fix Large CI & binary releases #481

Closed
wants to merge 4 commits into from
Closed

chore(*) fix Large CI & binary releases #481

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f34d4c9
chore(release) fix binary releases
thibaultcha Jan 16, 2024
423240b
chore(ci) fix Large CI CodeQL jobs
thibaultcha Jan 16, 2024
2fa2d6a
removeme
thibaultcha Jan 16, 2024
ba8d507
chore(dist) upgrade GCC to version 11 on Centos7
hishamhm Jan 17, 2024
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
5 changes: 3 additions & 2 deletions .github/workflows/ci-large.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: Large CI

on:
#pull_request:
# branches: '**'
pull_request:
branches: '**'
schedule:
- cron: '0 9 * * *' # 9am UTC, 2am PST
workflow_dispatch:
Expand Down Expand Up @@ -134,6 +134,7 @@ jobs:
uses: ./.github/workflows/job-codeql-analyzer.yml
with:
language: ${{ matrix.language }}
openresty: ${{ matrix.openresty }}
runtime: ${{ matrix.runtime }}

build:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ name: Release
on:
schedule:
- cron: "0 6 * * mon" # 6am UTC, 11pm PST
#pull_request:
# branches: '**'
pull_request:
branches: '**'
workflow_dispatch:
inputs:
release_version:
Expand Down
6 changes: 3 additions & 3 deletions assets/release/Dockerfiles/Dockerfile.amd64.centos7
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ RUN yum update -y && \
yum install -y epel-release && \
yum install -y centos-release-scl && \
yum install -y \
devtoolset-8 \
devtoolset-8-gcc-c++ \
devtoolset-8-libatomic-devel \
devtoolset-11 \
devtoolset-11-gcc-c++ \
devtoolset-11-libatomic-devel \
ninja-build \
clang \
cmake3 \
Expand Down
9 changes: 5 additions & 4 deletions util/release.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ build_static_binary() {
$DIST_SRC/NOTICE \
$dist_bin_name
tar czf $dist_bin_name.tar.gz $dist_bin_name
mv $dist_bin_name.tar.gz $DIR_DIST_OUT
cp $dist_bin_name.tar.gz $DIR_DIST_OUT
notice "Created $DIR_DIST_OUT/$dist_bin_name.tar.gz"
popd
}
Expand Down Expand Up @@ -338,6 +338,7 @@ build_with_runtime() {
release_source() {
notice "Creating source archive..."
pushd $DIR_DIST_WORK
cp $DIST_SRC/assets/release/INSTALL $DIST_SRC/INSTALL
tar czf $DIST_SRC.tar.gz \
$DIST_SRC/config \
$DIST_SRC/auto \
Expand Down Expand Up @@ -376,8 +377,8 @@ release_bin() {
notice "Building $arch binary..."

if [ "$(get_distro)" = "centos7" ]; then
notice "Enabling devtoolset-8 for CentOS..."
source /opt/rh/devtoolset-8/enable
notice "Enabling devtoolset-11 for CentOS..."
source /opt/rh/devtoolset-11/enable
gcc --version
export CC=gcc
fi
Expand Down Expand Up @@ -465,14 +466,14 @@ pushd $DIR_DIST_WORK

rm -rf $DIR_DIST_SRC/*
cp -R \
$NGX_WASM_DIR/assets/release/INSTALL \
$NGX_WASM_DIR/LICENSE \
$NGX_WASM_DIR/NOTICE \
$NGX_WASM_DIR/Makefile \
$NGX_WASM_DIR/config \
$NGX_WASM_DIR/auto \
$NGX_WASM_DIR/src \
$NGX_WASM_DIR/lib \
$NGX_WASM_DIR/assets \
$NGX_WASM_DIR/util \
$DIR_DIST_SRC

Expand Down
Loading