Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 218b9608 authored by Akhil's avatar Akhil 🙂
Browse files

Revert commits

parent 1240985c

.github/workflows/appstore-build-publish.yml

+7 −25
Original line number Diff line number Diff line
@@ -20,11 +20,6 @@ jobs: 
    if: ${{ github.repository_owner == 'nextcloud-releases' }}



    steps:

      - name: Check actor permission

        uses: skjnldsv/check-actor-permission@v2

        with:

          require: write



      - name: Set app env

        run: |

          # Split and keep last
@@ -32,7 +27,7 @@ jobs: 
          echo "APP_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV



      - name: Checkout

        uses: actions/checkout@v3

        uses: actions/checkout@v2

        with:

          path: ${{ env.APP_NAME }}
@@ -44,7 +39,7 @@ jobs: 
          expression: "//info//dependencies//nextcloud/@min-version"



      - name: Read package.json node and npm engines version

        uses: skjnldsv/read-package-engines-version-actions@v1.2

        uses: skjnldsv/read-package-engines-version-actions@v1.1

        id: versions

        # Continue if no package.json

        continue-on-error: true
@@ -56,7 +51,7 @@ jobs: 
      - name: Set up node ${{ steps.versions.outputs.nodeVersion }}

        # Skip if no package.json

        if: ${{ steps.versions.outputs.nodeVersion }}

        uses: actions/setup-node@v3

        uses: actions/setup-node@v2

        with:

          node-version: ${{ steps.versions.outputs.nodeVersion }}
@@ -91,29 +86,16 @@ jobs: 
          npm ci

          npm run build



      - name: Check Krankerl config

        id: krankerl

        uses: andstor/file-existence-action@v1

        with:

          files: ${{ env.APP_NAME }}/krankerl.toml



      - name: Install Krankerl

        if: steps.krankerl.outputs.files_exists == 'true'

        run: |

          wget https://github.com/ChristophWurst/krankerl/releases/download/v0.13.0/krankerl_0.13.0_amd64.deb

          sudo dpkg -i krankerl_0.13.0_amd64.deb



      - name: Package ${{ env.APP_NAME }} ${{ env.APP_VERSION }} with krankerl

        if: steps.krankerl.outputs.files_exists == 'true'

        run: |

          cd ${{ env.APP_NAME }}

          krankerl package



      - name: Package ${{ env.APP_NAME }} ${{ env.APP_VERSION }} with makefile

        if: steps.krankerl.outputs.files_exists != 'true'

      - name: Package ${{ env.APP_NAME }} ${{ env.APP_VERSION }}

        # Try krankerl, fallback to makefile

        run: |

          cd ${{ env.APP_NAME }}

          make appstore

          krankerl package || make appstore



      - name: Checkout server ${{ fromJSON(steps.appinfo.outputs.result).nextcloud.min-version }}

        continue-on-error: true
@@ -124,7 +106,7 @@ jobs: 
          unzip latest-$NCVERSION.zip



      - name: Checkout server master fallback

        uses: actions/checkout@v3

        uses: actions/checkout@v2

        if: ${{ steps.server-checkout.outcome != 'success' }}

        with:

          repository: nextcloud/server

.github/workflows/lint.yml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ jobs: 
    runs-on: ubuntu-latest

    strategy:

      matrix:

        php-versions: ['7.3', '7.4', '8.0', '8.1', '8.2']

        php-versions: ['7.2', '7.3', '7.4', '8.0']

    name: php${{ matrix.php-versions }} lint

    steps:

      - name: Checkout

.github/workflows/php-test.yml

+0 −8
Original line number Diff line number Diff line
@@ -16,18 +16,10 @@ jobs: 
        include:

          - php-versions: '7.3'

            nextcloud-versions: 'stable20'

          - php-versions: '7.4'

            nextcloud-versions: 'stable24'

          - php-versions: '8.0'

            nextcloud-versions: 'stable24'

          - php-versions: '8.1'

            nextcloud-versions: 'stable24'

          - php-versions: '7.4'

            nextcloud-versions: 'master'

          - php-versions: '8.0'

            nextcloud-versions: 'master'

          - php-versions: '8.1'

            nextcloud-versions: 'master'

    name: php${{ matrix.php-versions }} on ${{ matrix.nextcloud-versions }} unit tests

    env:

      CI: true

.gitlab-ci.yml

+10 −121
Original line number Diff line number Diff line 
stages:

    - prepare

    - test

    - build

    - deploy



default:

    image: node:15.14.0-stretch

    before_script:

        - npm set cache .npm

        - npm install --prefer-offline --no-audit

    cache:

        key: ${CI_COMMIT_REF_SLUG}

        paths:

            - .npm/

            - node_modules/



install-node-deps:

    stage: prepare

    before_script:

        - node --version

        - npm --version

    script:

        - npm set cache .npm

        - npm ci

    only:

        changes:

            - package*.json



lint:

    stage: test

    script:

        - npm run lint



build-frontend:

    stage: build

    script:

        - npm run build

        - mkdir -p dist/$CI_PROJECT_NAME

        - cp -a appinfo css img l10n lib templates js dist/$CI_PROJECT_NAME

    artifacts:

        paths:

            - dist/



.deploy:nextcloud-app:

    image: ubuntu:focal

    stage: deploy

    dependencies:

      - build-frontend

    before_script:

      - mkdir $HOME/.ssh

      - chmod 700 ~/.ssh

      - echo "$SSH_PRIVATE_KEY_ED" > $HOME/.ssh/id_ed25519

      - echo "$SSH_PUBKEY_ED" > $HOME/.ssh/id_ed25519.pub

      - echo "$SSH_KNOWN_HOSTS" > $HOME/.ssh/known_hosts

      - chmod 600 ~/.ssh/id_ed25519

      - chmod 644 ~/.ssh/known_hosts ~/.ssh/id_ed25519.pub

      - apt-get update && apt-get install -y openssh-client rsync

    script:

      - echo "Deploying $CI_PROJECT_NAME of $CI_PROJECT_PATH_SLUG to $CI_ENVIRONMENT_NAME ($DEPLOYMENT_HOST)"

      - rsync -avzh dist/ $SSH_USER@$DEPLOYMENT_HOST:/tmp/${CI_JOB_ID}

      - ssh $SSH_USER@$DEPLOYMENT_HOST "sudo rsync -avzh --chown www-data:www-data --delete /tmp/${CI_JOB_ID}/$CI_PROJECT_NAME ${DEPLOYMENT_PATH}/html/custom_apps/ && rm -rf /tmp/${CI_JOB_ID} && sudo docker exec -u www-data $CONTAINER_NAME /var/www/html/occ app:enable $CI_PROJECT_NAME"





deploy:dev01:

    extends: .deploy:nextcloud-app

    only:

      - master

      - main

      - production

      - calendar-invitation-suggestions

    environment:

      name: dev/01

      url: https://dev.eeo.one/

    variables:

      DEPLOYMENT_BRANCH: $CI_COMMIT_BRANCH

      CONTAINER_NAME: dev01_nextcloud



deploy:dev02:

  extends: .deploy:nextcloud-app

  when: manual

  only:

    - master

    - main

    - production

    - calendar-invitation-suggestions

  environment:

    name: dev/02

    url: https://ecloud02.dev.eeo.one

variables:

    DEPLOYMENT_BRANCH: $CI_COMMIT_BRANCH

    CONTAINER_NAME: dev02_nextcloud

    TO_PACKAGE: 'appinfo css img l10n lib templates js'



deploy:dev03:

  extends: .deploy:nextcloud-app

  when: manual

  only:

    - master

    - main

    - production

    - calendar-invitation-suggestions

  environment:

    name: dev/03

    url: https://ecloud03.dev.eeo.one

  variables:

    DEPLOYMENT_BRANCH: $CI_COMMIT_BRANCH

    CONTAINER_NAME: dev03_nextcloud



deploy:staging:

  extends: .deploy:nextcloud-app

  when: manual

  only:

    - master

    - main

    - production

  environment:

    name: staging/01

    url: https://eeo.one

  variables:

    DEPLOYMENT_BRANCH: $CI_COMMIT_BRANCH

    CONTAINER_NAME: nextcloud
 
include:

  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"

    ref: main

    file: "nc-apps-lint-build-frontend.yml"

  - project: "e/infra/ecloud/nextcloud-apps/ci-templates"

    ref: main

    file: "nc-apps-deploy.yml"

CHANGELOG.md

+0 −27
Original line number Diff line number Diff line 
# Changelog



## 3.3.2 – 2022-06-02

### Fixed

- Squished settings checkbox label



## 3.3.1 – 2022-05-19

### Fixed

- Free/busy view rendering

- Switching view modes

- Search term casing

- Sidebar scrolling



## 3.3.0 - 2022-05-05

### Added

- PHP8.1 compatability

- More uses for the popover modal

### Changed

- Rename "Download" to "Export"

### Fixed

- Crash on Chrome / Chromium for Simple Editor URL

- Invitation response button for readonly events



## 3.2.2 - 2022-03-16

### Fixed

- Email Validation for appointment booking

- Calendar resource attendance state display

- Alarm type selection



## 3.2.1 - 2022-03-14

### Fixed

- Public Calendar Link