diff --git a/.github/actions/neon-project-create/action.yml b/.github/actions/neon-project-create/action.yml index a393aa6106..d87eb01e2c 100644 --- a/.github/actions/neon-project-create/action.yml +++ b/.github/actions/neon-project-create/action.yml @@ -49,6 +49,10 @@ inputs: description: 'A JSON object with project settings' required: false default: '{}' + default_endpoint_settings: + description: 'A JSON object with the default endpoint settings' + required: false + default: '{}' outputs: dsn: @@ -80,7 +84,8 @@ runs: \"provisioner\": \"k8s-neonvm\", \"autoscaling_limit_min_cu\": ${MIN_CU}, \"autoscaling_limit_max_cu\": ${MAX_CU}, - \"settings\": ${PROJECT_SETTINGS} + \"settings\": ${PROJECT_SETTINGS}, + \"default_endpoint_settings\": ${DEFAULT_ENDPOINT_SETTINGS} } }") @@ -142,3 +147,4 @@ runs: PSQL: ${{ inputs.psql_path }} LD_LIBRARY_PATH: ${{ inputs.libpq_lib_path }} PROJECT_SETTINGS: ${{ inputs.project_settings }} + DEFAULT_ENDPOINT_SETTINGS: ${{ inputs.default_endpoint_settings }} diff --git a/.github/workflows/cloud-extensions.yml b/.github/workflows/cloud-extensions.yml index b498059fcd..f74ffbdfcd 100644 --- a/.github/workflows/cloud-extensions.yml +++ b/.github/workflows/cloud-extensions.yml @@ -19,11 +19,6 @@ defaults: run: shell: bash -euxo pipefail {0} -concurrency: - # Allow only one workflow - group: ${{ github.workflow }} - cancel-in-progress: true - permissions: id-token: write # aws-actions/configure-aws-credentials statuses: write @@ -40,9 +35,9 @@ jobs: matrix: pg-version: [16, 17] - runs-on: [self-hosted, small] + runs-on: us-east-2 container: - image: ghcr.io/neondatabase/neon-test-extensions-v${{ matrix.pg-version }}:14192004730 + image: ghcr.io/neondatabase/neon-test-extensions-v${{ matrix.pg-version }}:14263641182 credentials: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} @@ -56,12 +51,29 @@ jobs: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - name: Evaluate the settings + id: project-settings + run: | + if [[ matrix.pg-version -lt 17 ]]; then + ULID=ulid + else + ULID=pgx_ulid + fi + LIBS=timescaledb:rag_bge_small_en_v15,rag_jina_reranker_v1_tiny_en:$ULID + ( + echo -n settings=; + jq -c -n --arg libs $LIBS '{preload_libraries:{use_defaults:false,enabled_libraries:($libs| split(":"))}}' + ) >> $GITHUB_OUTPUT + + - name: Create Neon Project id: create-neon-project uses: ./.github/actions/neon-project-create with: region_id: ${{ inputs.region_id }} postgres_version: ${{ matrix.pg-version }} + project_settings: ${{ steps.outputs.project-settings.settings }} + default_endpoint_settings: '{"pg_settings":{"DateStyle":"Postgres,MDY","TimeZone":"America/Los_Angeles","neon.allow_unstable_extensions":"on"}}' api_key: ${{ secrets.NEON_STAGING_API_KEY }} - name: Run the regression tests