From dec1de8251d293e1add8f7e760538bc23da85353 Mon Sep 17 00:00:00 2001 From: egelhaus <156946629+egelhaus@users.noreply.github.com> Date: Mon, 10 Mar 2025 14:25:44 +0100 Subject: [PATCH 1/6] Enable Action --- .github/workflows/{dev-branch => dev-branch.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{dev-branch => dev-branch.yaml} (100%) diff --git a/.github/workflows/dev-branch b/.github/workflows/dev-branch.yaml similarity index 100% rename from .github/workflows/dev-branch rename to .github/workflows/dev-branch.yaml From c6f7c47ffb7d6989ac0eaabb0ec567d4d1d8e200 Mon Sep 17 00:00:00 2001 From: egelhaus <156946629+egelhaus@users.noreply.github.com> Date: Mon, 10 Mar 2025 15:47:10 +0100 Subject: [PATCH 2/6] Update Actions --- .github/workflows/build.yaml | 4 ---- .github/workflows/codeql.yml | 8 +------- .github/workflows/eslint.yaml | 9 +-------- 3 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 53964c0a..d88bce25 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -6,10 +6,6 @@ on: branches: - main - pull_request: - branches: - - main - jobs: build: runs-on: ubuntu-latest diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 6f1d8dc2..fee77313 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -4,13 +4,7 @@ name: "Code Quality Analysis" on: push: branches: - - main - paths: - - apps/** - - '!apps/docs/**' - - libraries/** - - pull_request: + - dev1 paths: - apps/** - '!apps/docs/**' diff --git a/.github/workflows/eslint.yaml b/.github/workflows/eslint.yaml index 8579a8e1..bcac0bf6 100644 --- a/.github/workflows/eslint.yaml +++ b/.github/workflows/eslint.yaml @@ -4,14 +4,7 @@ name: ESLint on: push: branches: - - main - paths: - - package.json - - apps/** - - '!apps/docs/**' - - libraries/** - - pull_request: + - dev1 paths: - package.json - apps/** From 919dd10e79a1813cfcbdd8d94af536508170ba4e Mon Sep 17 00:00:00 2001 From: egelhaus <156946629+egelhaus@users.noreply.github.com> Date: Mon, 10 Mar 2025 16:32:24 +0100 Subject: [PATCH 3/6] Delete .github/workflows/eslint.yaml --- .github/workflows/eslint.yaml | 53 ----------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 .github/workflows/eslint.yaml diff --git a/.github/workflows/eslint.yaml b/.github/workflows/eslint.yaml deleted file mode 100644 index bcac0bf6..00000000 --- a/.github/workflows/eslint.yaml +++ /dev/null @@ -1,53 +0,0 @@ ---- -name: ESLint - -on: - push: - branches: - - dev1 - paths: - - package.json - - apps/** - - '!apps/docs/**' - - libraries/** - -jobs: - eslint: - name: Run eslint scanning - runs-on: ubuntu-latest - permissions: - contents: read - security-events: write - actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status - strategy: - matrix: - service: ["backend", "frontend"] - steps: - - name: Checkout code - uses: actions/checkout@v4 - - - name: Setup node - uses: actions/setup-node@v4 - with: - node-version: '20' - cache: 'npm' - cache-dependency-path: | - **/package-lock.json - - - name: Install ESLint - run: | - npm install eslint - npm install @microsoft/eslint-formatter-sarif@2.1.7 - - - name: Run ESLint - run: npx eslint apps/${{ matrix.service }}/ - --config apps/${{ matrix.service }}/.eslintrc.json - --format @microsoft/eslint-formatter-sarif - --output-file apps/${{ matrix.service }}/eslint-results.sarif - continue-on-error: true - - - name: Upload analysis results to GitHub - uses: github/codeql-action/upload-sarif@v3 - with: - sarif_file: apps/${{ matrix.service }}/eslint-results.sarif - wait-for-processing: true From e6ec03c658916df842621af13522fc4e0e860226 Mon Sep 17 00:00:00 2001 From: Tom <66643501+FoamToaster@users.noreply.github.com> Date: Wed, 12 Mar 2025 16:33:02 +0000 Subject: [PATCH 4/6] Update bluesky.provider.ts Commented out the alt text line for now until there is a way to set this from within Postiz --- .../src/integrations/social/bluesky.provider.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts b/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts index f2d01a74..1535b4ec 100644 --- a/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts +++ b/libraries/nestjs-libraries/src/integrations/social/bluesky.provider.ts @@ -192,7 +192,7 @@ export class BlueskyProvider extends SocialAbstract implements SocialProvider { $type: 'app.bsky.embed.images', images: images.map((p) => ({ // can be an array up to 4 values - alt: 'image', // the alt text + // alt: 'image', // the alt text - commented this out for now until there is a way to set this from within Postiz image: p.data.blob, })), }, From 057755fcfa8dfead2e39d9d919606aec07f73c6b Mon Sep 17 00:00:00 2001 From: egelhaus <156946629+egelhaus@users.noreply.github.com> Date: Tue, 18 Mar 2025 07:56:47 +0100 Subject: [PATCH 5/6] Update Jenkinsfile --- Jenkinsfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 15523ca6..471e27a7 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -42,16 +42,15 @@ pipeline { post { always { + junit 'reports/junit.xml' + archiveArtifacts artifacts: 'reports/**', fingerprint: true cleanWs(cleanWhenNotBuilt: false, notFailBuild: true) } success { echo 'Build completed successfully!' - junit 'reports/junit.xml' - archiveArtifacts artifacts: 'reports/**', fingerprint: true } failure { echo 'Build failed!' - junit 'reports/junit.xml' // Ensures test results are captured even on failure } } -} \ No newline at end of file +} From 251cf074c767852adb305cbf0367297ef5524e4a Mon Sep 17 00:00:00 2001 From: egelhaus <156946629+egelhaus@users.noreply.github.com> Date: Tue, 18 Mar 2025 10:04:32 +0100 Subject: [PATCH 6/6] Update Jenkinsfile --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 471e27a7..13013971 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -29,7 +29,7 @@ pipeline { stage('Run Unit Tests') { steps { - sh 'npm run test -- --coverage --reporters=jest-junit' + sh 'npm run build -- --coverage --reporters=jest-junit' } } @@ -44,7 +44,7 @@ pipeline { always { junit 'reports/junit.xml' archiveArtifacts artifacts: 'reports/**', fingerprint: true - cleanWs(cleanWhenNotBuilt: false, notFailBuild: true) + cleanWs(cleanWhenNotBuilt: true, notFailBuild: true) } success { echo 'Build completed successfully!'