diff --git a/.woodpecker/test-e2e.yaml b/.woodpecker/test-e2e.yaml index f4468f8c9..c0bf103cd 100644 --- a/.woodpecker/test-e2e.yaml +++ b/.woodpecker/test-e2e.yaml @@ -36,8 +36,11 @@ steps: VITE_PROXY_ORIGIN: "http://pleroma:4000" VITE_PROXY_TARGET: "http://pleroma:4000" commands: - - mkdir -pv $APT_CACHE_DIR && apt-get -qq update - - apt-get install -y zip + - | + if [ "${CI_PIPELINE_EVENT}" != "pull_request" ]; then + mkdir -pv $APT_CACHE_DIR && apt-get -qq update + apt-get install -y zip + fi - npm install -g yarn@1.22.22 - yarn --frozen-lockfile - | @@ -56,25 +59,12 @@ steps: fi - | if ! yarn e2e:pw; then - zip -9qr ${CI_COMMIT_SHA:0:8}-e2e.zip ./test/e2e-playwright/test-results ./test/e2e-playwright/playwright-report + [ "${CI_PIPELINE_EVENT}" = "pull_request" ] || 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: *artifacts_uploader_image + image: docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0 when: - event: push branch: ${CI_REPO_DEFAULT_BRANCH} diff --git a/.woodpecker/test.yaml b/.woodpecker/test.yaml index 6a21f7d41..acc48aacc 100644 --- a/.woodpecker/test.yaml +++ b/.woodpecker/test.yaml @@ -33,30 +33,20 @@ steps: PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: "1" entrypoint: *script_file_entrypoint commands: - - mkdir -pv $APT_CACHE_DIR && apt-get -qq update - - apt-get -y install zip + - | + if [ "${CI_PIPELINE_EVENT}" != "pull_request" ]; then + mkdir -pv $APT_CACHE_DIR && apt-get -qq update + apt-get -y install zip + fi - yarn --frozen-lockfile - | if ! yarn unit-ci; then - zip -9qr ${CI_COMMIT_SHA:0:8}-screenshots.zip $(find . -type d -name __screenshots__) + [ "${CI_PIPELINE_EVENT}" = "pull_request" ] || 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: *artifacts_uploader_image + image: docker.io/woodpeckercommunity/plugin-gitea-package:0.5.0 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 new file mode 100644 index 000000000..e69de29bb