diff --git a/.woodpecker/build.yaml b/.woodpecker/build.yaml index 059fdb1ff..de91af5d8 100644 --- a/.woodpecker/build.yaml +++ b/.woodpecker/build.yaml @@ -18,7 +18,7 @@ steps: build: image: docker.io/node:18-alpine commands: - - apk add --no-cache zip git + - apk add --no-cache zip - yarn --frozen-lockfile - yarn build - if [ "${CI_PIPELINE_EVENT}" = "push" ] || [ "${CI_PIPELINE_EVENT}" = "manual" ]; then zip -9qr ${CI_REPO_DEFAULT_BRANCH}.zip dist/; fi diff --git a/.woodpecker/test-e2e.yaml b/.woodpecker/test-e2e.yaml index c0bf103cd..f4468f8c9 100644 --- a/.woodpecker/test-e2e.yaml +++ b/.woodpecker/test-e2e.yaml @@ -36,11 +36,8 @@ steps: VITE_PROXY_ORIGIN: "http://pleroma:4000" VITE_PROXY_TARGET: "http://pleroma:4000" commands: - - | - if [ "${CI_PIPELINE_EVENT}" != "pull_request" ]; then - mkdir -pv $APT_CACHE_DIR && apt-get -qq update - apt-get install -y zip - fi + - mkdir -pv $APT_CACHE_DIR && apt-get -qq update + - apt-get install -y zip - npm install -g yarn@1.22.22 - yarn --frozen-lockfile - | @@ -59,12 +56,25 @@ steps: fi - | if ! yarn e2e:pw; then - [ "${CI_PIPELINE_EVENT}" = "pull_request" ] || zip -9qr ${CI_COMMIT_SHA:0:8}-e2e.zip ./test/e2e-playwright/test-results ./test/e2e-playwright/playwright-report + zip -9qr ${CI_COMMIT_SHA:0:8}-e2e.zip ./test/e2e-playwright/test-results ./test/e2e-playwright/playwright-report exit 1 fi + upload-artifacts-pr: + image: &artifacts_uploader_image + docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0 + when: + - event: pull_request + status: [failure] + settings: + <<: *artifacts_uploader_settings + package_version: pr-${CI_COMMIT_PULL_REQUEST} + file_source: ./${CI_COMMIT_SHA:0:8}-e2e.zip + file_name: ./pr-${CI_COMMIT_PULL_REQUEST}-e2e.zip + update: true + upload-artifacts: - image: docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0 + image: *artifacts_uploader_image when: - event: push branch: ${CI_REPO_DEFAULT_BRANCH} diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml index acc48aacc..6a21f7d41 100644 --- a/.woodpecker/test.yaml +++ b/.woodpecker/test.yaml @@ -33,20 +33,30 @@ steps: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1" entrypoint: *script_file_entrypoint commands: - - | - if [ "${CI_PIPELINE_EVENT}" != "pull_request" ]; then - mkdir -pv $APT_CACHE_DIR && apt-get -qq update - apt-get -y install zip - fi + - mkdir -pv $APT_CACHE_DIR && apt-get -qq update + - apt-get -y install zip - yarn --frozen-lockfile - | if ! yarn unit-ci; then - [ "${CI_PIPELINE_EVENT}" = "pull_request" ] || zip -9qr ${CI_COMMIT_SHA:0:8}-screenshots.zip $(find . -type d -name __screenshots__) + zip -9qr ${CI_COMMIT_SHA:0:8}-screenshots.zip $(find . -type d -name __screenshots__) exit 1 fi + upload-artifacts-pr: + image: &artifacts_uploader_image + docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0 + when: + - event: pull_request + status: [failure] + settings: + <<: *artifacts_uploader_settings + package_version: pr-${CI_COMMIT_PULL_REQUEST} + file_source: ./${CI_COMMIT_SHA:0:8}-screenshots.zip + file_name: pr-${CI_COMMIT_PULL_REQUEST}-screenshots.zip + update: true + upload-artifacts: - image: docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0 + image: *artifacts_uploader_image when: - event: push branch: ${CI_REPO_DEFAULT_BRANCH} diff --git a/changelog.d/ci-pr-uploads-removal.skip b/changelog.d/ci-pr-uploads-removal.skip deleted file mode 100644 index e69de29bb..000000000 diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js index 96263d93b..564fae7f2 100644 --- a/src/components/notifications/notifications.js +++ b/src/components/notifications/notifications.js @@ -79,7 +79,6 @@ const Notifications = { return unseenNotificationsFromStore( this.$store, useMergedConfigStore().mergedConfig.notificationVisibility, - useMergedConfigStore().mergedConfig.ignoreInactionableSeen, ) }, filteredNotifications() { diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js index f2b9f3297..fd2157e29 100644 --- a/src/components/side_drawer/side_drawer.js +++ b/src/components/side_drawer/side_drawer.js @@ -76,7 +76,6 @@ const SideDrawer = { return unseenNotificationsFromStore( this.$store, useMergedConfigStore().mergedConfig.notificationVisibility, - useMergedConfigStore().mergedConfig.ignoreInactionableSeen, ) }, unseenNotificationsCount() { diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js index 6df02d9b3..1fbaf2a2c 100644 --- a/src/services/notification_utils/notification_utils.js +++ b/src/services/notification_utils/notification_utils.js @@ -113,7 +113,6 @@ export const unseenNotificationsFromStore = ( ) => { return filteredNotificationsFromStore(store, notificationVisibility).filter( ({ seen, type }) => { - console.log(ignoreInactionableSeen) if (!ignoreInactionableSeen) return !seen if (seen) return false return ACTIONABLE_NOTIFICATION_TYPES.has(type)