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

Fixes macos-11 tests #1196

Closed
wants to merge 10 commits into from
Closed

Fixes macos-11 tests #1196

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
83a32c4
tunnel for macos to try and debug
BradyBonnette Jul 6, 2023
8de97ef
new push after allowing actions to run on my fork
BradyBonnette Jul 6, 2023
980784c
attempt first install of sccache
BradyBonnette Jul 6, 2023
c045f6f
remove tunnel, because it does not work for mac
BradyBonnette Jul 6, 2023
e1d392c
fix yaml
BradyBonnette Jul 6, 2023
8a6911c
Create cache dir
BradyBonnette Jul 6, 2023
1678ffc
inching forward a little more
BradyBonnette Jul 6, 2023
a04f581
full suite
BradyBonnette Jul 6, 2023
863163d
Run all tests
BradyBonnette Jul 6, 2023
aba8b63
add back ubuntu tests
BradyBonnette Jul 6, 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
50 changes: 26 additions & 24 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,9 @@ jobs:
if: "!contains(github.event.head_commit.message, 'nogha')"
env:
RUSTC_WRAPPER: sccache
SCCACHE_CACHE_SIZE: 20G
SCCACHE_DIR: /Users/runner/Library/Caches/Mozilla.sccache
SCCACHE_IDLE_TIMEOUT: 0

strategy:
matrix:
Expand All @@ -397,9 +400,11 @@ jobs:
echo ""

echo "----- Install sccache -----"
brew update
brew install sccache
mkdir -p /Users/runner/Library/Caches/Mozilla.sccache
curl -L https://github.com/mozilla/sccache/releases/download/v0.5.4/sccache-v0.5.4-x86_64-apple-darwin.tar.gz | tar xz
mv -f sccache-v0.5.4-x86_64-apple-darwin/sccache /usr/local/bin
Copy link
Contributor

Choose a reason for hiding this comment

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

I would like it if we could avoid this becoming stale. I don't see an easy fix for this though, so @BradyBonnette, do you mind subscribing to the github notifications for new sccache releases and keeping this up to date?

(I would volunteer but rust project stuff overwhelms my github notification box, and I'd definitely fail to notice a release)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There might be something we could do internally. Ill take this conversation into Discord because there are considerations here.

chmod +x /usr/local/bin/sccache
mkdir -p $SCCACHE_DIR
sccache --version

# https://stackoverflow.com/questions/57968497/how-do-i-set-an-env-var-with-a-bash-expression-in-github-actions/57969570#57969570
echo "----- Getting pre-installed Postgres major version -----"
Expand All @@ -409,7 +414,7 @@ jobs:

echo "----- Set up Postgres permissions -----"
sudo chmod a+rwx `$(which pg_config) --pkglibdir` `$(which pg_config) --sharedir`/extension
ls -lath `$(which pg_config) --pkglibdir` `$(which pg_config) --sharedir`/extension
# ls -lath `$(which pg_config) --pkglibdir` `$(which pg_config) --sharedir`/extension
echo ""

echo "----- Output Cargo version -----"
Expand All @@ -420,46 +425,43 @@ jobs:
env
echo ""


- name: Cache sccache directory
uses: actions/cache@v3
continue-on-error: false
with:
path: /Users/runner/Library/Caches/Mozilla.sccache
key: pgrx-sccache-macos-11-${{ hashFiles('**/Cargo.lock', '.github/workflows/tests.yml') }}
key: pgrx-sccache-macos-11-${{ hashFiles('**/Cargo.lock', '.github/workflows/tests.yml', '.cargo/config.toml') }}

- name: Cache cargo directory
uses: actions/cache@v3
with:
path: |
~/.cargo
key: pgrx-cargo-macos-11-tests-${{ hashFiles('**/Cargo.lock', '.github/workflows/tests.yml', '.cargo/config.toml') }}

- name: Start sccache server
run: sccache --start-server

- name: Print sccache stats
run: sccache --show-stats

- name: Cache cargo directory
uses: actions/cache@v3
with:
path: |
~/.cargo/registry
~/.cargo/git
key: pgrx-macos-11-tests-${{ hashFiles('**/Cargo.lock', '.github/workflows/tests.yml') }}

- name: Install cargo-pgrx
run: cargo install --path cargo-pgrx/ --debug --force

- name: Print sccache stats
run: sccache --show-stats

- name: Run 'cargo pgrx init'
run: |
set -x
cargo pgrx init --pg$PG_VER $(which pg_config)

- name: Run base-level tests
run: |
set -x
cargo test \
--features "pg$PG_VER" --no-default-features \
--package cargo-pgrx \
--package pgrx \
--package pgrx-macros \
--package pgrx-pg-sys \
--package pgrx-tests \
--package pgrx-sql-entity-graph
- name: Run tests
run: cargo test --all --features "pg$PG_VER pg_test cshim" --no-default-features

- name: Print sccache stats
run: sccache --show-stats

- name: Stop sccache server
run: sccache --stop-server || true