diff --git a/.github/file-filters.yml b/.github/file-filters.yml index 8d2d93fac..eb0791ffa 100644 --- a/.github/file-filters.yml +++ b/.github/file-filters.yml @@ -2,6 +2,7 @@ backend: &backend - '.github/workflows/test-backend.yml' - 'backend/**/*' - 'neo4j/**/*' + - 'package.json' docker: &docker - 'docker-compose.*' @@ -9,3 +10,4 @@ docker: &docker webapp: &webapp - '.github/workflows/test-webapp.yml' - 'webapp/**/*' + - 'package.json' diff --git a/.github/workflows/cleanup-cache-at-pr-closing.yml b/.github/workflows/cleanup-cache-at-pr-closing.yml index 284702e76..6512d1d64 100644 --- a/.github/workflows/cleanup-cache-at-pr-closing.yml +++ b/.github/workflows/cleanup-cache-at-pr-closing.yml @@ -22,7 +22,7 @@ jobs: continue-on-error: true steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Cleanup run: | diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index e386b7efa..e9546685a 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,7 +14,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup env run: | echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV @@ -47,7 +47,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup env run: | echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV @@ -96,7 +96,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup env run: | echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV @@ -145,7 +145,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup env run: | echo "VERSION=$(node -p -e "require('./package.json').version")" >> $GITHUB_ENV @@ -243,7 +243,7 @@ jobs: needs: [upload_to_dockerhub] steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # Fetch full History for changelog - name: Setup env @@ -283,7 +283,7 @@ jobs: needs: [github_tag] steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 # Fetch full History for changelog - name: Setup env diff --git a/.github/workflows/test-backend.yml b/.github/workflows/test-backend.yml index e2e20a747..5371c56c1 100644 --- a/.github/workflows/test-backend.yml +++ b/.github/workflows/test-backend.yml @@ -11,7 +11,7 @@ jobs: backend: ${{ steps.changes.outputs.backend }} docker: ${{ steps.changes.outputs.docker }} steps: - - uses: actions/checkout@v3.3.0 + - uses: actions/checkout@v4 - name: Check for backend file changes uses: dorny/paths-filter@v2.11.1 @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Neo4J | Build 'community' image run: | @@ -37,7 +37,7 @@ jobs: - name: Cache docker images id: cache-neo4j - uses: actions/cache/save@v3.3.1 + uses: actions/cache/save@v3.3.2 with: path: /tmp/neo4j.tar key: ${{ github.run_id }}-backend-neo4j-cache @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: backend | Build 'test' image run: | @@ -58,7 +58,7 @@ jobs: - name: Cache docker images id: cache-backend - uses: actions/cache/save@v3.3.1 + uses: actions/cache/save@v3.3.2 with: path: /tmp/backend.tar key: ${{ github.run_id }}-backend-cache @@ -70,7 +70,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: backend | Lint run: cd backend && yarn && yarn run lint @@ -84,17 +84,17 @@ jobs: checks: write steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Restore Neo4J cache - uses: actions/cache/restore@v3.3.1 + uses: actions/cache/restore@v3.3.2 with: path: /tmp/neo4j.tar key: ${{ github.run_id }}-backend-neo4j-cache fail-on-cache-miss: true - name: Restore Backend cache - uses: actions/cache/restore@v3.3.1 + uses: actions/cache/restore@v3.3.2 with: path: /tmp/backend.tar key: ${{ github.run_id }}-backend-cache diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml index 46ed27d33..7a449261b 100644 --- a/.github/workflows/test-e2e.yml +++ b/.github/workflows/test-e2e.yml @@ -8,7 +8,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Copy env files run: | @@ -36,7 +36,7 @@ jobs: - name: Cache docker images id: cache - uses: actions/cache/save@v3.3.1 + uses: actions/cache/save@v3.3.2 with: path: | /opt/cucumber-json-formatter @@ -58,7 +58,7 @@ jobs: job: [1, 2, 3, 4, 5, 6, 7, 8] steps: - name: Restore cache - uses: actions/cache/restore@v3.3.1 + uses: actions/cache/restore@v3.3.2 id: cache with: path: | diff --git a/.github/workflows/test-webapp.yml b/.github/workflows/test-webapp.yml index 6a0bbf9e2..3f8063bd7 100644 --- a/.github/workflows/test-webapp.yml +++ b/.github/workflows/test-webapp.yml @@ -11,7 +11,7 @@ jobs: docker: ${{ steps.changes.outputs.docker }} webapp: ${{ steps.changes.outputs.webapp }} steps: - - uses: actions/checkout@v3.3.0 + - uses: actions/checkout@v4 - name: Check for frontend file changes uses: dorny/paths-filter@v2.11.1 @@ -28,7 +28,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Check translation files run: | @@ -42,7 +42,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Webapp | Build 'test' image run: | @@ -50,7 +50,7 @@ jobs: docker save "ocelotsocialnetwork/webapp:test" > /tmp/webapp.tar - name: Cache docker image - uses: actions/cache/save@v3.3.1 + uses: actions/cache/save@v3.3.2 with: path: /tmp/webapp.tar key: ${{ github.run_id }}-webapp-cache @@ -62,7 +62,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: webapp | Lint run: cd webapp && yarn && yarn run lint @@ -76,10 +76,10 @@ jobs: checks: write steps: - name: Checkout code - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Restore webapp cache - uses: actions/cache/restore@v3.3.1 + uses: actions/cache/restore@v3.3.2 with: path: /tmp/webapp.tar key: ${{ github.run_id }}-webapp-cache diff --git a/CHANGELOG.md b/CHANGELOG.md index dcf0595fa..c1b368544 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,8 +4,11 @@ All notable changes to this project will be documented in this file. Dates are d Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog). -#### [3.0.4](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/3.0.3...3.0.4) +#### [3.1.0](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/3.0.3...3.1.0) +- chore(other): use dkim values in helm script of backend [`#6731`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6731) +- fix(other): add global package.json to workflow file filters [`#6706`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6706) +- chore(other): release v3.0.4 – fix group link on map, embed backend shot down and bug on post language detect [`#6725`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6725) - fix(other): fix backup script for neo4j v4 [`#6662`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6662) - fix(other): fix workflow cache cleanup fail [`#6722`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6722) - fix(backend): fix post language detection [`#6720`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/6720) diff --git a/backend/Dockerfile b/backend/Dockerfile index fc6c1f4b3..6795ccf95 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,7 +1,7 @@ ################################################################################## # BASE (Is pushed to DockerHub for rebranding) ################################### ################################################################################## -FROM node:20.2.0-alpine3.17 as base +FROM node:20.6.0-alpine3.17 as base # ENVs ## DOCKER_WORKDIR would be a classical ARG, but that is not multi layer persistent - shame diff --git a/backend/package.json b/backend/package.json index 557aa16e1..c7db8afb9 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "ocelot-social-backend", - "version": "3.0.4", + "version": "3.1.0", "description": "GraphQL Backend for ocelot.social", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", "author": "ocelot.social Community", diff --git a/deployment/src/kubernetes/templates/backend/ConfigMap.yml b/deployment/src/kubernetes/templates/backend/ConfigMap.yml index 1222b0da0..11782b474 100644 --- a/deployment/src/kubernetes/templates/backend/ConfigMap.yml +++ b/deployment/src/kubernetes/templates/backend/ConfigMap.yml @@ -21,6 +21,9 @@ data: SMTP_PORT: "{{ .Values.BACKEND.SMTP_PORT }}" SMTP_IGNORE_TLS: "{{ .Values.BACKEND.SMTP_IGNORE_TLS }}" SMTP_SECURE: "{{ .Values.BACKEND.SMTP_SECURE }}" + SMTP_DKIM_DOMAINNAME: "{{ .Values.BACKEND.SMTP_DKIM_DOMAINNAME }}" + SMTP_DKIM_KEYSELECTOR: "{{ .Values.BACKEND.SMTP_DKIM_KEYSELECTOR }}" + SMTP_DKIM_PRIVATKEY: "{{ .Values.BACKEND.SMTP_DKIM_PRIVATKEY }}" GRAPHQL_URI: "http://{{ .Release.Name }}-backend:4000" NEO4J_URI: "bolt://{{ .Release.Name }}-neo4j:7687" #REDIS_DOMAIN: ---toBeSet(IP)--- diff --git a/package.json b/package.json index 784b4259d..124033b4b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ocelot-social", - "version": "3.0.4", + "version": "3.1.0", "description": "Free and open source software program code available to run social networks.", "author": "ocelot.social Community", "license": "MIT", diff --git a/webapp/maintenance/source/package.json b/webapp/maintenance/source/package.json index 1d173ae32..426333b86 100644 --- a/webapp/maintenance/source/package.json +++ b/webapp/maintenance/source/package.json @@ -1,6 +1,6 @@ { "name": "@ocelot-social/maintenance", - "version": "3.0.4", + "version": "3.1.0", "description": "Maintenance page for ocelot.social", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", "author": "ocelot.social Community", diff --git a/webapp/package.json b/webapp/package.json index 8899fbac3..5fa0522d9 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,6 +1,6 @@ { "name": "ocelot-social-webapp", - "version": "3.0.4", + "version": "3.1.0", "description": "ocelot.social Frontend", "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social", "author": "ocelot.social Community",