Skip to content

Commit

Permalink
chore(release): Test v7.24.1 (#9587)
Browse files Browse the repository at this point in the history
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: Matt Krick <[email protected]>
Co-authored-by: Rafa <[email protected]>
Co-authored-by: Georg Bremer <[email protected]>
Co-authored-by: Nick O'Ferrall <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: parabol-release-bot[bot] <150284312+parabol-release-bot[bot]@users.noreply.github.com>
Co-authored-by: Matt Krick <[email protected]>
Co-authored-by: Jordan Husney <[email protected]>
Co-authored-by: adaniels-parabol <[email protected]>
Co-authored-by: snyk-bot <[email protected]>
Co-authored-by: Dale Bumblis <[email protected]>
Co-authored-by: Bartosz Jarocki <[email protected]>
Co-authored-by: Marcus Wermuth <[email protected]>
Co-authored-by: Rafael Romero <[email protected]>
Co-authored-by: Bruce Tian <[email protected]>
Co-authored-by: github-actions <[email protected]>
  • Loading branch information
16 people authored Apr 2, 2024
1 parent 76e92a1 commit fec143b
Show file tree
Hide file tree
Showing 112 changed files with 2,802 additions and 1,538 deletions.
2 changes: 1 addition & 1 deletion .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ SOCKET_PORT='3001'
# AI MODELS
AI_EMBEDDING_MODELS='[{"model": "text-embeddings-inference:llmrails/ember-v1", "url": "http://localhost:3040/"}]'
AI_GENERATION_MODELS='[{"model": "text-generation-inference:TheBloke/zephyr-7b-beta", "url": "http://localhost:3050/"}]'
AI_EMBEDDER_ENABLED='true'
AI_EMBEDDER_WORKERS='1'

# APPLICATION
# AMPLITUDE_WRITE_KEY='key_AMPLITUDE_WRITE_KEY'
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
id-token: "write"
services:
postgres:
image: pgvector/pgvector:pg15
image: pgvector/pgvector:0.6.2-pg15
# This env variables must be the same in the file PARABOL_BUILD_ENV_PATH
env:
POSTGRES_PASSWORD: "temppassword"
Expand Down Expand Up @@ -143,6 +143,6 @@ jobs:
uses: ravsamhq/notify-slack-action@v2
with:
status: ${{ job.status }}
notify_when: 'failure'
notify_when: "failure"
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_GH_ACTIONS_NOTIFICATIONS }}
14 changes: 8 additions & 6 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
id-token: "write"
services:
postgres:
image: postgres:15.4
image: pgvector/pgvector:0.6.2-pg15
# This env variables must be the same in the file PARABOL_BUILD_ENV_PATH
env:
POSTGRES_PASSWORD: "temppassword"
Expand Down Expand Up @@ -78,17 +78,13 @@ jobs:
yarn db:migrate
yarn pg:migrate up
yarn pg:build
yarn pg:generate
- name: Build for testing
run: yarn build

- name: Verify source is clean
run: git diff --quiet HEAD || (echo "Changes in generated files detected"; git diff; exit 1)

- name: Check Code Quality
run: yarn codecheck

- name: Run Predeploy for Testing
run: yarn predeploy

Expand All @@ -100,6 +96,12 @@ jobs:
wait-on: |
http://localhost:3000/graphql
- name: Kysely Codegen
run: yarn pg:generate

- name: Check Code Quality
run: yarn codecheck

- name: Run server tests
run: yarn test:server -- --reporters=default --reporters=jest-junit
env:
Expand Down Expand Up @@ -139,6 +141,6 @@ jobs:
uses: ravsamhq/notify-slack-action@v2
with:
status: ${{ job.status }}
notify_when: 'failure'
notify_when: "failure"
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_GH_ACTIONS_NOTIFICATIONS }}
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "7.23.1"
".": "7.24.1"
}
21 changes: 21 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,27 @@ This project adheres to [Semantic Versioning](http://semver.org/).

This CHANGELOG follows conventions [outlined here](http://keepachangelog.com/).

## [7.24.1](https://github.com/ParabolInc/parabol/compare/v7.24.0...v7.24.1) (2024-04-02)


### Fixed

* embedder doesn't dive deep into schema ([#9582](https://github.com/ParabolInc/parabol/issues/9582)) ([8cdd901](https://github.com/ParabolInc/parabol/commit/8cdd9014c3277905605c6544de92d9ac2833a6e9))
* embedder errors in embed length ([#9584](https://github.com/ParabolInc/parabol/issues/9584)) ([341b4b7](https://github.com/ParabolInc/parabol/commit/341b4b797ec6444066244f25916803e64c03258c))
* Fetch CORS resources from network ([#9586](https://github.com/ParabolInc/parabol/issues/9586)) ([b6ddfa5](https://github.com/ParabolInc/parabol/commit/b6ddfa5755394633e83dadd0178234ef740454ea))

## [7.24.0](https://github.com/ParabolInc/parabol/compare/v7.23.1...v7.24.0) (2024-03-29)


### Added

* prepare embedder for Production ([#9517](https://github.com/ParabolInc/parabol/issues/9517)) ([538c95c](https://github.com/ParabolInc/parabol/commit/538c95ce4dc7d4839b3e813006cb20e1b7d1d1c8))


### Changed

* fix tsconfig problems ([#9579](https://github.com/ParabolInc/parabol/issues/9579)) ([d1af0f1](https://github.com/ParabolInc/parabol/commit/d1af0f164c629e8fc075278cd63475e8913f4295))

## [7.23.1](https://github.com/ParabolInc/parabol/compare/v7.23.0...v7.23.1) (2024-03-28)


Expand Down
24 changes: 12 additions & 12 deletions docker/images/parabol-ubi/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,21 @@ Recommended:

## Variables

| Name | Description | Possible values | Recommended value |
| -------------------- | ----------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------- | ------------------------------------------------------------------- |
| `postgresql_tag` | PostgreSQL version from the [Docker image](https://hub.docker.com/_/postgres) | `Any tag` | `15.4` |
| `rethinkdb_tag` | RethinkDB version from the [Docker image](https://hub.docker.com/_/rethinkdb) | `Any tag` | `2.4.2` |
| `redis_tag` | Redis version from the [Docker image](https://hub.docker.com/_/redis) | `Any tag` | `7.0-alpine` |
| `_BUILD_ENV_PATH` | File `.env` used by the application during the build process | `Relative path from the root level of the repository` | `docker/parabol-ubi/environments/basic-env` |
| `_NODE_VERSION` | Node version, used by Docker to use the Docker image node:\_NODE_VERSION as base image to build | `Same as in root package.json` | |
| `_DOCKERFILE` | Dockerfile used to build the image | `Relative path from the root level of the repository` | `./docker/parabol-ubi/dockerfiles/basic.dockerfile` |
| `_DOCKER_REPOSITORY` | The destination repository | `String` | `parabol` |
| `_DOCKER_TAG` | Tag for the produced image | `String` | |
| Name | Description | Possible values | Recommended value |
| -------------------- | ----------------------------------------------------------------------------------------------- | ----------------------------------------------------- | --------------------------------------------------- |
| `postgresql_tag` | PostgreSQL version from the [Docker image](https://hub.docker.com/r/pgvector/pgvector) | `Any tag` | `0.6.2-pg15` |
| `rethinkdb_tag` | RethinkDB version from the [Docker image](https://hub.docker.com/_/rethinkdb) | `Any tag` | `2.4.2` |
| `redis_tag` | Redis version from the [Docker image](https://hub.docker.com/_/redis) | `Any tag` | `7.0-alpine` |
| `_BUILD_ENV_PATH` | File `.env` used by the application during the build process | `Relative path from the root level of the repository` | `docker/parabol-ubi/environments/basic-env` |
| `_NODE_VERSION` | Node version, used by Docker to use the Docker image node:\_NODE_VERSION as base image to build | `Same as in root package.json` | |
| `_DOCKERFILE` | Dockerfile used to build the image | `Relative path from the root level of the repository` | `./docker/parabol-ubi/dockerfiles/basic.dockerfile` |
| `_DOCKER_REPOSITORY` | The destination repository | `String` | `parabol` |
| `_DOCKER_TAG` | Tag for the produced image | `String` | |

Example of variables:

```commandLine
export postgresql_tag=15.4; \
export postgresql_tag=0.6.2-pg15; \
export rethinkdb_tag=2.4.2; \
export redis_tag=7.0-alpine; \
export _BUILD_ENV_PATH=docker/parabol-ubi/environments/basic-env; \
Expand Down Expand Up @@ -61,7 +61,7 @@ cp $_BUILD_ENV_PATH ./.env
> :warning: Stop all database containers you might have running before executing the following command. If other database containers are running, some ports might be already taken.
```commandLine
docker run --name temp-postgres -e POSTGRES_PASSWORD=temppassword -e POSTGRES_USER=tempuser -e POSTGRES_DB=tempdb -d -p 5432:5432 postgres:$postgresql_tag && \
docker run --name temp-postgres -e POSTGRES_PASSWORD=temppassword -e POSTGRES_USER=tempuser -e POSTGRES_DB=tempdb -d -p 5432:5432 pgvector/pgvector:$postgresql_tag && \
docker run --name temp-rethinkdb -d -p 28015:28015 -p 29015:29015 -p 8080:8080 rethinkdb:$rethinkdb_tag && \
docker run --name temp-redis -d -p 6379:6379 redis:$redis_tag
```
Expand Down
4 changes: 4 additions & 0 deletions docker/images/parabol-ubi/environments/pipeline
Original file line number Diff line number Diff line change
Expand Up @@ -54,3 +54,7 @@ STRIPE_PUBLISHABLE_KEY='pk_test_MNoKbCzQX0lhktuxxI7M14wd'
STRIPE_SECRET_KEY=''
STRIPE_WEBHOOK_SECRET=''
HUBSPOT_API_KEY=''
AI_EMBEDDING_MODELS='[{"model": "text-embeddings-inference:llmrails/ember-v1", "url": "http://localhost:3040/"}]'
AI_GENERATION_MODELS='[{"model": "text-generation-inference:TheBloke/zephyr-7b-beta", "url": "http://localhost:3050/"}]'
AI_EMBEDDER_WORKERS='1'
POSTGRES_USE_PGVECTOR='true'
2 changes: 1 addition & 1 deletion docker/stacks/development/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ services:
networks:
parabol-network:
text-embeddings-inference:
image: ghcr.io/huggingface/text-embeddings-inference:cpu-0.6
image: ghcr.io/huggingface/text-embeddings-inference:cpu-1.2
command:
- "--model-id=llmrails/ember-v1"
platform: linux/x86_64
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ services:
postgres:
container_name: postgres
profiles: ["databases"]
image: postgres:15.4
image: pgvector/pgvector:0.6.2-pg15
restart: always
env_file: .env
environment:
Expand Down
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "An open-source app for building smarter, more agile teams.",
"author": "Parabol Inc. <[email protected]> (http://github.com/ParabolInc)",
"license": "AGPL-3.0",
"version": "7.23.1",
"version": "7.24.1",
"repository": {
"type": "git",
"url": "https://github.com/ParabolInc/parabol"
Expand Down Expand Up @@ -92,18 +92,19 @@
"@types/dotenv": "^6.1.1",
"@types/jscodeshift": "^0.11.3",
"@types/lodash.toarray": "^4.4.7",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@typescript-eslint/eslint-plugin": "^7.4.0",
"@typescript-eslint/parser": "^7.4.0",
"autoprefixer": "^10.4.13",
"babel-loader": "^9.1.2",
"concurrently": "^8.0.1",
"copy-webpack-plugin": "^11.0.0",
"eslint-config-prettier": "^8.5.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"graphql": "15.7.2",
"html-webpack-plugin": "^5.5.0",
"husky": "^7.0.4",
"jscodeshift": "^0.14.0",
"kysely": "^0.27.2",
"kysely": "^0.27.3",
"kysely-codegen": "^0.11.0",
"lerna": "^6.4.1",
"mini-css-extract-plugin": "^2.7.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/chronos/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "chronos",
"version": "7.23.1",
"version": "7.24.1",
"description": "A cron job scheduler",
"author": "Matt Krick <[email protected]>",
"homepage": "https://github.com/ParabolInc/parabol/tree/master/packages/chronos#readme",
Expand All @@ -25,6 +25,6 @@
},
"dependencies": {
"cron": "^2.3.1",
"parabol-server": "7.23.1"
"parabol-server": "7.24.1"
}
}
11 changes: 2 additions & 9 deletions packages/chronos/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@
"~/*": ["client/*"]
},
"outDir": "lib",
"lib": ["esnext"],
"types": ["node"]
},
"files": [
"chronos.ts",
"../server/types/webpackEnv.ts",
"../server/types/modules.d.ts",
"../client/modules/email/components/SummaryEmail/MeetingSummaryEmail/MeetingSummaryEmail.tsx"
]
"lib": ["esnext"]
}
}
74 changes: 0 additions & 74 deletions packages/client/components/AnimatedFade.tsx

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import graphql from 'babel-plugin-relay/macro'
import React from 'react'
import {useFragment} from 'react-relay'
import useUnusedRecords from '~/hooks/useUnusedRecords'
import {AzureDevOpsScopingSelectAllIssues_workItems$key} from '../__generated__/AzureDevOpsScopingSelectAllIssues_workItems.graphql'
import useAtmosphere from '../hooks/useAtmosphere'
import useMutationProps from '../hooks/useMutationProps'
import UpdatePokerScopeMutation from '../mutations/UpdatePokerScopeMutation'
Expand All @@ -11,7 +12,6 @@ import {PALETTE} from '../styles/paletteV3'
import {Threshold} from '../types/constEnums'
import AzureDevOpsClientManager from '../utils/AzureDevOpsClientManager'
import getSelectAllTitle from '../utils/getSelectAllTitle'
import {AzureDevOpsScopingSelectAllIssues_workItems$key} from '../__generated__/AzureDevOpsScopingSelectAllIssues_workItems.graphql'
import Checkbox from './Checkbox'

const Item = styled('div')({
Expand Down Expand Up @@ -42,7 +42,7 @@ interface Props {
}

const AzureDevOpsScopingSelectAllIssues = (props: Props) => {
const {meetingId, usedServiceTaskIds, workItems: workItemsRef, providerId} = props
const {meetingId, usedServiceTaskIds, workItems: workItemsRef} = props
const workItems = useFragment(
graphql`
fragment AzureDevOpsScopingSelectAllIssues_workItems on AzureDevOpsWorkItemEdge
Expand All @@ -57,7 +57,7 @@ const AzureDevOpsScopingSelectAllIssues = (props: Props) => {
workItemsRef
)
const atmosphere = useAtmosphere()
const {onCompleted, onError, submitMutation, submitting, error} = useMutationProps()
const {onCompleted, onError, submitMutation, error} = useMutationProps()
const getProjectId = (url: URL) => {
const firstIndex = url.pathname.indexOf('/', 1)
const seconedIndex = url.pathname.indexOf('/', firstIndex + 1)
Expand Down
43 changes: 0 additions & 43 deletions packages/client/hooks/useAtlassianSites.ts

This file was deleted.

Loading

0 comments on commit fec143b

Please sign in to comment.