diff --git a/.github/workflows/oci.yml b/.github/workflows/oci.yml index 580824036a60b..f95389757bed0 100644 --- a/.github/workflows/oci.yml +++ b/.github/workflows/oci.yml @@ -1,6 +1,7 @@ name: PHPUnit oci -on: pull_request +on: + pull_request: permissions: contents: read @@ -10,8 +11,31 @@ concurrency: cancel-in-progress: true jobs: + changes: + runs-on: ubuntu-latest-low + + outputs: + src: ${{ steps.changes.outputs.src}} + + steps: + - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 + id: changes + continue-on-error: true + with: + filters: | + src: + - '.github/workflows/**' + - '3rdparty/**' + - '**/lib/**' + - '**/tests/**' + - '**/vendor-bin/**' + - '.php-cs-fixer.dist.php' + - 'composer.json' + - 'composer.lock' + - '**.php' + phpunit-oci: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest if: ${{ github.repository_owner != 'nextcloud-gmbh' }} @@ -42,12 +66,12 @@ jobs: steps: - name: Checkout server - uses: actions/checkout@v3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: submodules: true - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@v2 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 with: php-version: ${{ matrix.php-versions }} extensions: ctype, curl, dom, fileinfo, gd, imagick, intl, json, mbstring, oci8, openssl, pcntl, pdo_sqlite, posix, sqlite, xml, zip @@ -59,6 +83,7 @@ jobs: - name: Set up Nextcloud run: | + composer install mkdir data ./occ maintenance:install --verbose --database=oci --database-name=XE --database-host=127.0.0.1 --database-port=1521 --database-user=autotest --database-pass=owncloud --admin-user admin --admin-pass admin php -f index.php @@ -74,8 +99,8 @@ jobs: summary: permissions: contents: none - runs-on: ubuntu-latest - needs: phpunit-oci + runs-on: ubuntu-latest-low + needs: [changes, phpunit-oci] if: always() @@ -83,4 +108,4 @@ jobs: steps: - name: Summary status - run: if ${{ needs.phpunit-oci.result != 'success' }}; then exit 1; fi + run: if ${{ needs.changes.outputs.src != 'false' && needs.phpunit-oci.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/s3-primary-integration.yml b/.github/workflows/s3-primary-integration.yml index 2a2ab43f5c64e..eec599f0ba4c7 100644 --- a/.github/workflows/s3-primary-integration.yml +++ b/.github/workflows/s3-primary-integration.yml @@ -1,51 +1,80 @@ name: S3 primary storage integration tests on: pull_request: - push: - branches: - - master - - stable* + +concurrency: + group: integration-s3-primary-${{ github.head_ref || github.run_id }} + cancel-in-progress: true jobs: - s3-primary-integration-tests-minio: - runs-on: ubuntu-20.04 + changes: + runs-on: ubuntu-latest-low - if: ${{ github.repository_owner != 'nextcloud-gmbh' }} + outputs: + src: ${{ steps.changes.outputs.src}} + + steps: + - uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2 + id: changes + continue-on-error: true + with: + filters: | + src: + - '.github/workflows/**' + - '3rdparty/**' + - '**/*.php' + - '**/lib/**' + - '**/tests/**' + - '**/vendor-bin/**' + - 'build/integration/**' + - '.php-cs-fixer.dist.php' + - 'composer.json' + - 'composer.lock' + + integration-s3-primary: + runs-on: ubuntu-latest + needs: changes + + if: needs.changes.outputs.src != 'false' && github.repository_owner != 'nextcloud-gmbh' strategy: # do not stop on another job's failure fail-fast: false matrix: - php-versions: ['8.0'] - key: ['objectstore', 'objectstore_multibucket'] + php-versions: ["8.0"] + key: ["objectstore", "objectstore_multibucket"] name: php${{ matrix.php-versions }}-${{ matrix.key }}-minio services: redis: - image: redis + image: ghcr.io/nextcloud/continuous-integration-redis:latest + options: --health-cmd="redis-cli ping" --health-interval=10s --health-timeout=5s --health-retries=3 ports: - - "6379:6379" + - 6379:6379/tcp minio: + image: bitnami/minio@sha256:50cec18ac4184af4671a78aedd5554942c8ae105d51a465fa82037949046da01 # v2025.4.22 env: - MINIO_ACCESS_KEY: minio - MINIO_SECRET_KEY: minio123 - image: bitnami/minio:2021.12.29 + MINIO_ROOT_USER: nextcloud + MINIO_ROOT_PASSWORD: bWluaW8tc2VjcmV0LWtleS1uZXh0Y2xvdWQ= + MINIO_DEFAULT_BUCKETS: nextcloud ports: - "9000:9000" steps: - name: Checkout server - uses: actions/checkout@v3 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: submodules: true - name: Set up php ${{ matrix.php-versions }} - uses: shivammathur/setup-php@v2 + uses: shivammathur/setup-php@c541c155eee45413f5b09a52248675b1a2575231 # v2.31.1 with: php-version: ${{ matrix.php-versions }} - tools: phpunit:9 - extensions: mbstring, fileinfo, intl, sqlite, pdo_sqlite, zip, gd, redis + # https://docs.nextcloud.com/server/stable/admin_manual/installation/source_installation.html#prerequisites-for-manual-installation + extensions: bz2, ctype, curl, dom, fileinfo, gd, iconv, intl, json, libxml, mbstring, openssl, pcntl, posix, redis, session, simplexml, xmlreader, xmlwriter, zip, zlib, sqlite, pdo_sqlite + coverage: "none" + ini-file: development env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -57,7 +86,7 @@ jobs: - name: Set up Nextcloud run: | mkdir data - echo ' ["class" => "OC\Files\ObjectStore\S3", "arguments" => ["bucket" => "nextcloud", "autocreate" => true, "key" => "minio", "secret" => "minio123", "hostname" => "localhost", "port" => 9000, "use_ssl" => false, "use_path_style" => true, "uploadPartSize" => 52428800]]];' > config/config.php + echo ' ["class" => "OC\Files\ObjectStore\S3", "arguments" => ["bucket" => "nextcloud", "autocreate" => true, "key" => "nextcloud", "secret" => "bWluaW8tc2VjcmV0LWtleS1uZXh0Y2xvdWQ=", "hostname" => "localhost", "port" => 9000, "use_ssl" => false, "use_path_style" => true, "uploadPartSize" => 52428800]]];' > config/config.php echo ' ["host" => "localhost", "port" => 6379], "memcache.local" => "\OC\Memcache\Redis", "memcache.distributed" => "\OC\Memcache\Redis"];' > config/redis.config.php ./occ maintenance:install --verbose --database=sqlite --database-name=nextcloud --database-host=127.0.0.1 --database-user=root --database-pass=rootpassword --admin-user admin --admin-pass admin php -f index.php @@ -74,13 +103,14 @@ jobs: docker ps -a docker ps -aq | while read container ; do IMAGE=$(docker inspect --format='{{.Config.Image}}' $container); echo $IMAGE; docker logs $container; echo "\n\n" ; done - s3-primary-integration-summary: - runs-on: ubuntu-latest - needs: [s3-primary-integration-tests-minio] + permissions: + contents: none + runs-on: ubuntu-latest-low + needs: [changes, integration-s3-primary] if: always() steps: - name: Summary status - run: if ${{ needs.s3-primary-integration-tests-minio.result != 'success' }}; then exit 1; fi + run: if ${{ needs.changes.outputs.src != 'false' && needs.integration-s3-primary.result != 'success' }}; then exit 1; fi diff --git a/.github/workflows/s3-primary.yml b/.github/workflows/s3-primary.yml index 9b4269d737b4f..7ce40944b7444 100644 --- a/.github/workflows/s3-primary.yml +++ b/.github/workflows/s3-primary.yml @@ -8,7 +8,7 @@ on: jobs: s3-primary-tests-minio: - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 if: ${{ github.repository_owner != 'nextcloud-gmbh' }} @@ -23,6 +23,7 @@ jobs: services: minio: + image: bitnami/minio@sha256:50cec18ac4184af4671a78aedd5554942c8ae105d51a465fa82037949046da01 # v2025.4.22 env: MINIO_ACCESS_KEY: minio MINIO_SECRET_KEY: minio123 @@ -68,7 +69,7 @@ jobs: s3-primary-summary: - runs-on: ubuntu-latest + runs-on: ubuntu-latest-low needs: [s3-primary-tests-minio] if: always()