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.

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

Disable llvm on macos #4916

Merged
merged 1 commit into from Nov 3, 2022
Merged

Disable llvm on macos #4916

merged 1 commit into from Nov 3, 2022

Conversation

akuzm
Copy link
Member

@akuzm akuzm commented Nov 3, 2022

I accidentally re-enabled it when adding the flaky check.

I accidentally re-enabled it when adding the flaky check.
@codecov
Copy link

codecov bot commented Nov 3, 2022

Codecov Report

Merging #4916 (9834f0f) into main (2475c1b) will increase coverage by 0.01%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4916      +/-   ##
==========================================
+ Coverage   89.51%   89.53%   +0.01%     
==========================================
  Files         226      226              
  Lines       50678    50677       -1     
==========================================
+ Hits        45366    45375       +9     
+ Misses       5312     5302      -10     
Impacted Files Coverage Δ
tsl/src/bgw_policy/job.c 88.31% <0.00%> (-0.05%) ⬇️
src/bgw/job.c 94.14% <0.00%> (+0.16%) ⬆️
src/bgw/scheduler.c 87.72% <0.00%> (+2.30%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 2475c1b...9834f0f. Read the comment docs.

./configure --prefix=$HOME/$PG_INSTALL_DIR --with-llvm LLVM_CONFIG=${{ matrix.llvm_config }} --with-openssl --without-readline --without-zlib --without-libxml ${{ matrix.pg_extra_args }}
if [[ "${{ runner.os }}" == "Linux" ]]; then
./configure --prefix=$HOME/$PG_INSTALL_DIR --with-llvm LLVM_CONFIG=${{ matrix.llvm_config }} --with-openssl --without-readline --without-zlib --without-libxml ${{ matrix.pg_extra_args }}
else
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe check for MacOS explicitly?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, I'll fix it here: #4897
For now just returted the old version to get the CI back fast.

Comment on lines +95 to +100
if [[ "${{ runner.os }}" == "Linux" ]]; then
./configure --prefix=$HOME/$PG_INSTALL_DIR --with-llvm LLVM_CONFIG=${{ matrix.llvm_config }} --with-openssl --without-readline --without-zlib --without-libxml ${{ matrix.pg_extra_args }}
else
# the current github macos image has a buggy llvm installation so we build without llvm on mac
./configure --prefix=$HOME/$PG_INSTALL_DIR --with-openssl --without-readline --without-zlib --without-libxml ${{ matrix.pg_extra_args }}
fi
Copy link
Member

Choose a reason for hiding this comment

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

Cant you put --without-llvm in pg_extra_args in matrix builder instead

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, I'll fix it here: #4897
For now just returted the old version to get the CI back fast.

Copy link
Member Author

Choose a reason for hiding this comment

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

I didn't notice it because of the build caching, going to fix this problem as well.

Copy link
Member

Choose a reason for hiding this comment

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

then we dont need matrix.llvm_config anymore if we move this all into matrix builder into pg_extra_args, keeps the workflow cleaner

Copy link
Member Author

Choose a reason for hiding this comment

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

Yep, that's what I've done there.

Copy link
Member

Choose a reason for hiding this comment

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

this PR has no matrix builder changes

Copy link
Member Author

Choose a reason for hiding this comment

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

There in #4897 I mean.

https://github.com/timescale/timescaledb/pull/4897/files#diff-93f32462b75c120eacd7ebe4d9a44caefe0627c996ca7a39091da0707bb8dd40R62

Let's merge this PR first, which is a revert of the earlier incorrect changes. Our CI is actually broken now, Bharaty reported this failure.

@akuzm akuzm enabled auto-merge (rebase) November 3, 2022 10:53
@akuzm akuzm merged commit 08791ca into timescale:main Nov 3, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants