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

chore(ci): Fix failing weekly jobs #603

Merged
Merged
Show file tree
Hide file tree
Changes from 9 commits
Commits
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
1 change: 0 additions & 1 deletion .github/workflows/docker-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ jobs:
- { runs_on: "ubuntu-latest", platform: "fedora", arch: "amd64", service: "verify" }
- { runs_on: "ubuntu-latest", platform: "archlinux", arch: "amd64", service: "verify" }
- { runs_on: "ubuntu-latest", platform: "alpine", arch: "amd64", service: "verify" }
- { runs_on: "ubuntu-latest", arch: "amd64", platform: "integration", service: "integration" }

- { runs_on: ["self-hosted", "arm"], platform: "ubuntu", arch: "arm64", service: "verify" }
- { runs_on: ["self-hosted", "arm"], platform: "fedora", arch: "arm64", service: "verify" }
Expand Down
11 changes: 9 additions & 2 deletions .github/workflows/integration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,21 @@ on:
push:
branches:
- main
- 'maint-**'
paleolimbot marked this conversation as resolved.
Show resolved Hide resolved
pull_request:
paths:
- .github/workflows/integration.yaml
- src/nanoarrow/**
- docker-compose.yml
schedule:
- cron: '5 0 * * 0'

permissions:
contents: read

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
integration:
runs-on: ubuntu-latest
Expand All @@ -37,5 +44,5 @@ jobs:

- name: Run integration tests
run: |
echo "::group::Docker Pull"
echo "::group::Docker Build"
docker compose run --rm -e GITHUB_ACTIONS integration
1 change: 1 addition & 0 deletions .github/workflows/python-wheels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ on:
push:
branches:
- main
- 'maint-**'
workflow_dispatch:

permissions:
Expand Down
7 changes: 7 additions & 0 deletions .github/workflows/verify.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
name: Verification

on:
push:
branches:
- 'maint-**'
workflow_dispatch:
inputs:
version:
Expand All @@ -43,6 +46,10 @@ on:
permissions:
contents: read

concurrency:
group: ${{ github.repository }}-${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

jobs:
verify:
name: "${{ matrix.config.label }}"
Expand Down
3 changes: 1 addition & 2 deletions ci/docker/alpine.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@ ENV NANOARROW_PYTHON_VENV "/venv"

# For R. Note that arrow is not installed (takes too long).
RUN mkdir ~/.R && echo "MAKEFLAGS = -j$(nproc)" > ~/.R/Makevars
RUN R -e 'install.packages("desc", repos = "https://cloud.r-project.org")' && mkdir /tmp/rdeps
COPY r/DESCRIPTION /tmp/rdeps
RUN R -e 'install.packages(setdiff(desc::desc("/tmp/rdeps")$get_deps()$package, "arrow"), repos = "https://cloud.r-project.org")'
RUN R -e 'gsub("\\(.*?\\)", "", read.dcf("/tmp/rdeps")[1, "Suggests"]) |> strsplit("[^A-Za-z0-9.]+") |> unlist(use.names = FALSE) |> setdiff("arrow") |> install.packages(repos = "https://cloud.r-project.org")'
RUN rm -f ~/.R/Makevars

ENV NANOARROW_CMAKE_OPTIONS -DArrow_DIR=/arrow/lib/cmake/Arrow
8 changes: 2 additions & 6 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@
# specific language governing permissions and limitations
# under the License.

version: '3.5'

services:
verify:
image: ${REPO}:${NANOARROW_PLATFORM}-${NANOARROW_ARCH}
Expand Down Expand Up @@ -48,12 +46,10 @@ services:
command: "/bin/bash /build-docs.sh /nanoarrow"

integration:
# Based on an arrow-dev repo image that is amd64 only
image: ${REPO}:integration-amd64
# Don't cache here (building the image takes about the same amount of time
# as downloading on CI)
Comment on lines +49 to +50
Copy link
Member

Choose a reason for hiding this comment

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

That's probably because the base image is hosted on dockerhub (and pretty big iirc), in my experience things on ghcr.io have much better download characteristics. Though maybe the build is just that fast too ^^

Copy link
Member Author

Choose a reason for hiding this comment

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

In any case, I moved it to a weekly job for now since it's a better fit for that suite (and either building or downloading is still >10 minutes) 🙂

build:
context: .
cache_from:
- ${REPO}:integration-amd64
dockerfile: ci/docker/integration.dockerfile
volumes:
- ${NANOARROW_DOCKER_SOURCE_DIR}:/arrow-integration/nanoarrow
Expand Down
1 change: 1 addition & 0 deletions src/nanoarrow/ipc/reader_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ TEST(NanoarrowIpcReader, InputStreamBuffer) {

TEST(NanoarrowIpcReader, InputStreamFile) {
struct ArrowIpcInputStream stream;
errno = EINVAL;
ASSERT_EQ(ArrowIpcInputStreamInitFile(&stream, nullptr, 1), EINVAL);

uint8_t input_data[] = {0x01, 0x02, 0x03, 0x04, 0x05};
Expand Down
1 change: 1 addition & 0 deletions src/nanoarrow/ipc/writer_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ TEST(NanoarrowIpcWriter, OutputStreamFile) {

TEST(NanoarrowIpcWriter, OutputStreamFileError) {
nanoarrow::ipc::UniqueOutputStream stream;
errno = EINVAL;
EXPECT_EQ(ArrowIpcOutputStreamInitFile(stream.get(), nullptr, /*close_on_release=*/1),
EINVAL);

Expand Down
Loading