diff --git a/.github/workflows/dataserver-image.yml b/.github/workflows/dataserver-image.yml deleted file mode 100644 index 35600f2c..00000000 --- a/.github/workflows/dataserver-image.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: Dataserver Image CI - -on: - push: - paths: - - docker/dataserver/** - - ds.Dockerfile - - .github/workflows/dataserver-image.yml - branches: [ "new_dev" ] - - pull_request: - branches: [ "new_dev" ] - paths: - - docker/dataserver/** - - ds.Dockerfile - - .github/workflows/dataserver-image.yml - -jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Build the Docker image - run: docker build . --file ds.Dockerfile --tag app-zotprime-dataserver:$(date +%s) \ No newline at end of file diff --git a/.github/workflows/dataserver-php.yml b/.github/workflows/dataserver-php.yml deleted file mode 100644 index 5b6b6895..00000000 --- a/.github/workflows/dataserver-php.yml +++ /dev/null @@ -1,82 +0,0 @@ -name: Dataserver PHP Composer - -on: - push: - branches: [ "new_dev" ] - paths: - - dataserver/** - - .github/workflows/dataserver-php.yml - pull_request: - branches: [ "new_dev" ] - paths: - - dataserver/** - - .github/workflows/dataserver-php.yml -permissions: - contents: read - - - -#defaults: -# run: -# working-directory: ./dataserver - -jobs: - build: - - runs-on: ubuntu-latest - - strategy: - matrix: - php-version: - - "7.4" - - dependencies: - - "locked" - - - steps: - - uses: actions/checkout@v3 - - - name: Install PHP - uses: shivammathur/setup-php@v2 - with: - php-version: ${{ matrix.php-version }} - - - name: Checkout submodules - run: git submodule update --init dataserver - - - name: Validate composer.json and composer.lock - working-directory: ./dataserver - run: composer validate --strict - - - - name: "Determine composer cache directory" - id: "determine-composer-cache-directory" - working-directory: ./dataserver - run: "echo \"::set-output name=directory::$(composer config cache-dir)\"" - - - name: "Cache dependencies installed with composer" - uses: "actions/cache@v3" - with: - path: "dataserver${{ steps.determine-composer-cache-directory.outputs.directory }}" - key: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-${{ hashFiles('composer.lock') }}" - restore-keys: "php-${{ matrix.php-version }}-composer-${{ matrix.dependencies }}-" - - -# - name: Cache Composer packages -# id: composer-cache -# uses: actions/cache@v3 -# with: -# path: vendor -# key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} -# restore-keys: | -# ${{ runner.os }}-php- - - - name: Install dependencies - working-directory: ./dataserver - run: composer install --prefer-dist --no-progress - - # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit" - # Docs: https://getcomposer.org/doc/articles/scripts.md - - # - name: Run test suite \ No newline at end of file diff --git a/.github/workflows/streamserver-image.yml b/.github/workflows/streamserver-image.yml deleted file mode 100644 index 1b959853..00000000 --- a/.github/workflows/streamserver-image.yml +++ /dev/null @@ -1,35 +0,0 @@ -name: Streamserver Image CI - -on: - push: - paths: - - stream-server/** - - docker/stream-server/** - - .github/workflows/streamserver-image.yml - branches: [ "new_dev" ] - - pull_request: - branches: [ "new_dev" ] - paths: - - stream-server/** - - docker/stream-server/** - - .github/workflows/streamserver-image.yml - - -jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - name: Checkout submodules - run: git submodule update --init stream-server - - name: Build the Docker image -# working-directory: ./stream-server - run: docker build . --file sts.Dockerfile --tag app-zotprime-streamserver:$(date +%s) -# uses: docker/build-push-action@v2 -# with: -# context: . -# file: Dockerfile diff --git a/README.md b/README.md index 0e32f2ed..8380d1ac 100644 --- a/README.md +++ b/README.md @@ -23,7 +23,7 @@ $ n 16.20.0 ```bash $ mkdir /path/to/your/app && cd /path/to/your/app $ git clone --recursive https://github.com/uniuuu/zotprime.git -$ git checkout tags/ -b +$ git checkout production $ cd zotprime ```