Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
35 changes: 15 additions & 20 deletions .github/workflows/electric_telemetry_tests.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
name: Electric Telemetry CI
name: electric-telemetry

on:
push:
branches: ['main']
paths-ignore:
- 'website/**'
- '**/README.md'
- 'integration-tests/**'
paths:
- 'packages/electric-telemetry/**'
pull_request:
paths-ignore:
- 'website/**'
- '**/README.md'
- 'integration-tests/**'
paths:
- 'packages/electric-telemetry/**'

permissions:
contents: read
Expand All @@ -34,33 +30,32 @@ jobs:
version-type: strict
version-file: '.tool-versions'

- name: Cache electric-telemetry dependencies
- name: Cache dependencies
uses: actions/cache@v4
with:
path: packages/electric-telemetry/deps
key: ${{ runner.os }}-electric-telemetry-deps-${{ hashFiles('packages/electric-telemetry/mix.lock') }}
key: ${{ runner.os }}-electric-telemetry-deps-${{ env.MIX_ENV }}-${{ hashFiles('packages/electric-telemetry/mix.lock') }}
restore-keys: |
${{ runner.os }}-electric-telemetry-deps-${{ hashFiles('packages/electric-telemetry/mix.lock') }}
${{ runner.os }}-electric-telemetry-deps-
${{ runner.os }}-electric-telemetry-deps-${{ env.MIX_ENV }}-${{ hashFiles('packages/electric-telemetry/mix.lock') }}
${{ runner.os }}-electric-telemetry-deps-${{ env.MIX_ENV }}
${{ runner.os }}-electric-telemetry-deps

- name: Cache compiled code
uses: actions/cache@v4
with:
path: |
packages/electric-telemetry/_build/*/lib
!packages/electric-telemetry/_build/*/lib/electric_telemetry
key: "${{ runner.os }}-electric-telemetry-build-${{ env.MIX_ENV }}-${{ hashFiles('packages/sync-service/mix.lock') }}"
key: "${{ runner.os }}-electric-telemetry-build-${{ env.MIX_ENV }}-${{ hashFiles('packages/electric-telemetry/mix.lock') }}"
restore-keys: |
${{ runner.os }}-electric-telemetry-build-${{ env.MIX_ENV }}-${{ hashFiles('packages/sync-service/mix.lock') }}
${{ runner.os }}-electric-telemetry-build-${{ env.MIX_ENV }}-
${{ runner.os }}-electric-telemetry-build-
${{ runner.os }}-electric-telemetry-build-${{ env.MIX_ENV }}-${{ hashFiles('packages/electric-telemetry/mix.lock') }}
${{ runner.os }}-electric-telemetry-build-${{ env.MIX_ENV }}
${{ runner.os }}-electric-telemetry-build

- name: Install dependencies
run: mix do deps.get + deps.compile

- name: Compile
# don't bail on compile warnings - let's get the results of the tests
# and let the formatting task check for compilation warnings
- name: Compile package
run: mix compile

- name: Run tests
Expand Down
35 changes: 14 additions & 21 deletions .github/workflows/elixir_client_tests.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
name: Elixir Client CI
name: elixir-client

on:
push:
branches: ['main']
paths-ignore:
- 'website/**'
- '**/README.md'
- 'integration-tests/**'
paths:
- 'packages/elixir-client/**'
pull_request:
paths-ignore:
- 'website/**'
- '**/README.md'
- 'integration-tests/**'
paths:
- 'packages/elixir-client/**'

permissions:
contents: read
Expand All @@ -26,9 +22,7 @@ jobs:
env:
MIX_ENV: test
MIX_OS_DEPS_COMPILE_PARTITION_COUNT: 4
POSTGRES_VERSION: 140006
ELECTRIC_PORT: 3100
PG_PORT: 54323
ELECTRIC_URL: 'http://127.0.0.1:3333'
DATABASE_URL: 'postgresql://postgres:password@127.0.0.1:54323/postgres?sslmode=disable'
services:
Expand All @@ -51,16 +45,17 @@ jobs:
version-type: strict
version-file: '.tool-versions'

- name: Cache elixir-client dependencies
- name: Cache dependencies
uses: actions/cache@v4
with:
path: packages/elixir-client/deps
key: ${{ runner.os }}-elixir-client-deps-${{ hashFiles('packages/elixir-client/mix.lock') }}
key: ${{ runner.os }}-elixir-client-deps-${{ env.MIX_ENV }}-${{ hashFiles('packages/elixir-client/mix.lock') }}
restore-keys: |
${{ runner.os }}-elixir-client-deps-${{ hashFiles('packages/elixir-client/mix.lock') }}
${{ runner.os }}-elixir-client-deps-
${{ runner.os }}-elixir-client-deps-${{ env.MIX_ENV }}-${{ hashFiles('packages/elixir-client/mix.lock') }}
${{ runner.os }}-elixir-client-deps-${{ env.MIX_ENV }}
${{ runner.os }}-elixir-client-deps

- name: Cache elixir-client compiled code
- name: Cache compiled code
uses: actions/cache@v4
with:
path: |
Expand All @@ -69,15 +64,13 @@ jobs:
key: "${{ runner.os }}-elixir-client-build-${{ env.MIX_ENV }}-${{ hashFiles('packages/elixir-client/mix.lock') }}"
restore-keys: |
${{ runner.os }}-elixir-client-build-${{ env.MIX_ENV }}-${{ hashFiles('packages/elixir-client/mix.lock') }}
${{ runner.os }}-elixir-client-build-${{ env.MIX_ENV }}-
${{ runner.os }}-elixir-client-build-
${{ runner.os }}-elixir-client-build-${{ env.MIX_ENV }}
${{ runner.os }}-elixir-client-build

- name: Install dependencies
run: mix do deps.get + deps.compile

- name: Compile
# don't bail on compile warnings - let's get the results of the tests
# and let the formatting task check for compilation warnings
- name: Compile package
run: mix compile

- name: Run tests
Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,22 @@
name: Electric CI
name: sync-service

on:
push:
branches: ['main']
paths-ignore:
- 'website/**'
- '**/README.md'
- 'integration-tests/**'
- 'packages/**'
- '!packages/electric-telemetry'
- '!packages/sync-service'
paths:
- 'packages/electric-telemetry/**'
- 'packages/sync-service/**'
pull_request:
paths-ignore:
- 'website/**'
- '**/README.md'
- 'integration-tests/**'
- 'packages/**'
- '!packages/electric-telemetry'
- '!packages/sync-service'
paths:
- 'packages/electric-telemetry/**'
- 'packages/sync-service/**'

permissions:
contents: read

jobs:
build_and_test:
name: 'Build and test sync-service, Postgres ${{ matrix.postgres_version }}'
name: 'Build and test sync-service, pg${{ matrix.postgres_version }}'
runs-on: ubuntu-latest
defaults:
run:
Expand All @@ -35,6 +27,7 @@ jobs:
postgres_version: [14, 15, 17, 18]
env:
MIX_ENV: test
MIX_TARGET: application
MIX_OS_DEPS_COMPILE_PARTITION_COUNT: 4
POSTGRES_VERSION: '${{ matrix.postgres_version }}0000'
services:
Expand Down Expand Up @@ -77,30 +70,29 @@ jobs:
uses: actions/cache@v4
with:
path: packages/sync-service/deps
key: "${{ runner.os }}-sync-service-deps-${{ env.MIX_TARGET }}-${{ env.MIX_ENV }}-${{ hashFiles('packages/sync-service/mix.lock') }}"
key: "${{ runner.os }}-sync-service-deps-${{ env.MIX_ENV }}-${{ hashFiles('packages/sync-service/mix.lock') }}"
restore-keys: |
${{ runner.os }}-sync-service-deps-${{ env.MIX_TARGET }}-${{ env.MIX_ENV }}-${{ hashFiles('packages/sync-service/mix.lock') }}
${{ runner.os }}-sync-service-deps-${{ env.MIX_TARGET }}-${{ env.MIX_ENV }}-
${{ runner.os }}-sync-service-deps-
${{ runner.os }}-sync-service-deps-${{ env.MIX_ENV }}-${{ hashFiles('packages/sync-service/mix.lock') }}
${{ runner.os }}-sync-service-deps-${{ env.MIX_ENV }}
${{ runner.os }}-sync-service-deps

- name: Cache compiled code
uses: actions/cache@v4
with:
path: |
packages/sync-service/_build/*/lib
!packages/sync-service/_build/*/lib/electric
key: "${{ runner.os }}-sync-service-build-${{ env.MIX_TARGET }}-${{ env.MIX_ENV }}-${{ hashFiles('packages/sync-service/mix.lock') }}"
!packages/sync-service/_build/*/lib/electric_telemetry
key: "${{ runner.os }}-sync-service-build-${{ env.MIX_ENV }}-${{ hashFiles('packages/sync-service/mix.lock') }}"
restore-keys: |
${{ runner.os }}-sync-service-build-${{ env.MIX_TARGET }}-${{ env.MIX_ENV }}-${{ hashFiles('packages/sync-service/mix.lock') }}
${{ runner.os }}-sync-service-build-${{ env.MIX_TARGET }}-${{ env.MIX_ENV }}-
${{ runner.os }}-sync-service-build-
${{ runner.os }}-sync-service-build-${{ env.MIX_ENV }}-${{ hashFiles('packages/sync-service/mix.lock') }}
${{ runner.os }}-sync-service-build-${{ env.MIX_ENV }}
${{ runner.os }}-sync-service-build

- name: Install dependencies
run: mix do deps.get + deps.compile

- name: Compile
# don't bail on compile warnings - let's get the results of the tests
# and let the formatting task check for compilation warnings
- name: Compile package
run: mix compile

- name: Run tests
Expand Down
1 change: 1 addition & 0 deletions packages/sync-service/test/support/component_setup.ex
Original file line number Diff line number Diff line change
Expand Up @@ -451,6 +451,7 @@ defmodule Support.ComponentSetup do
shape_cleaner_opts: shape_cleaner_opts(ctx)
],
manual_table_publishing?: Map.get(ctx, :manual_table_publishing?, false),
telemetry_opts: [instance_id: "test_instance", version: Electric.version()],
feature_flags: Electric.Config.get_env(:feature_flags)},
restart: :temporary,
significant: false
Expand Down