From a4c5dd87d2de25e0f8da83011d045d1b467f31e3 Mon Sep 17 00:00:00 2001 From: Liam Date: Sat, 2 Mar 2024 11:40:21 +0000 Subject: [PATCH] 7 --- .github/FUNDING.yml | 3 - .github/ISSUE_TEMPLATE/bug_report.yml | 89 ---------------------- .github/ISSUE_TEMPLATE/config.yml | 8 -- .github/ISSUE_TEMPLATE/feature_request.yml | 56 -------------- .github/stale.yml | 16 ---- .github/workflows/ci.yml | 39 ---------- .github/workflows/docs.yml | 40 ---------- .github/workflows/image.yml | 65 +++++----------- 8 files changed, 20 insertions(+), 296 deletions(-) delete mode 100644 .github/FUNDING.yml delete mode 100644 .github/ISSUE_TEMPLATE/bug_report.yml delete mode 100644 .github/ISSUE_TEMPLATE/config.yml delete mode 100644 .github/ISSUE_TEMPLATE/feature_request.yml delete mode 100644 .github/stale.yml delete mode 100644 .github/workflows/ci.yml delete mode 100644 .github/workflows/docs.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 945c8da..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,3 +0,0 @@ -# These are supported funding model platforms - -github: keshavdv diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml deleted file mode 100644 index 9b49da2..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ /dev/null @@ -1,89 +0,0 @@ -name: Bug report -description: Create a bug report to help us improve -labels: - - "Type: Bug" - - "Status: Waiting triage" -body: - - type: markdown - attributes: - value: | - # :warning: **Please read before raising the issue** :warning: - - If you have a **question**, need clarification on something, need help on a particular situation or want to start a discussion, **DO NOT** open an issue here. _It will be automatically closed!_ - - Ask the question on one of our [Discord channels](https://discord.gg/Bxk9uGT6MW) - If you're not keen to Discord, you can also use [GitHub Discussions](https://github.com/keshavdv/unifi-cam-proxy/discussions). - If you really want to raise an issue, please make sure to follow the template and provide the required information. Failing to do so will most likely end up on the issue being close. Don't take offense at this. It is simply a time management decision. Whenever an issue is raised without following the template and the required information is not provided, very often too much time has to be spent going back and forth to obtain the details that are outlined below. - - - type: input - id: camera_model - attributes: - label: Camera - description: The make/model/hardware revision of the camera you are attempting to use. - placeholder: camera model - validations: - required: false - - - type: input - id: fw_version - attributes: - label: Firmware version of the camera - description: What's the firmware version where you're seeing this happening. If applicable. - placeholder: ex. 1.2.3.456, N/A - validations: - required: false - - - type: textarea - id: description - attributes: - label: Description - description: A clear and concise description of what the problem is. - validations: - required: true - - - type: textarea - id: repro_steps - attributes: - label: How to reproduce - description: Detailed repro steps so we can see the same problem. If not already explained above. - placeholder: | - 1. - 2. - ... - validations: - required: false - - - type: textarea - id: expected_behaviour - attributes: - label: Expected behaviour - description: A clear and concise description of what you expected to happen. If applicable. - validations: - required: false - - - type: textarea - id: screenshots - attributes: - label: Screenshots - description: Very helpful if you send along a few screenshots to help visualize the issue! - placeholder: drag and drop here, if applicable - validations: - required: false - - - type: textarea - id: other_things - attributes: - label: Additional information - description: Other suggested things. If applicable/relevant. - placeholder: | - for example link to the repository with sample code - code snippets - validations: - required: false - - - type: markdown - attributes: - value: | - ### Make an effort to fix the bug - - Attempt to submit a [Pull Request (PR)](https://help.github.com/articles/about-pull-requests/) that fixes the bug. Include in this PR a test that verifies the fix. If you were not able to fix the bug, a PR that illustrates your partial progress will suffice. diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 869666f..0000000 --- a/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,8 +0,0 @@ -blank_issues_enabled: false -contact_links: - - name: unifi-cam-proxy Discord Community - url: https://discord.gg/Bxk9uGT6MW - about: Please join for QUESTIONS, conversations or discussions. - - name: GitHub Discussions - url: https://github.com/keshavdv/unifi-cam-proxy/discussions - about: Alternative channel for asking QUESTIONS. diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml deleted file mode 100644 index eeb069a..0000000 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ /dev/null @@ -1,56 +0,0 @@ -name: Feature request -description: Suggest an idea to help us improve. -labels: - - "Type: Feature request" - - "Status: waiting feedback" -body: - - type: markdown - attributes: - value: | - # :warning: **Please read before raising the issue** :warning: - - If you have a **question**, need clarification on something, need help on a particular situation or want to start a discussion, **DO NOT** open an issue here. _It will be automatically closed!_ - - Ask the question on one of our [Discord channels](https://discord.gg/Bxk9uGT6MW). - If you're not keen to Discord, you can also use [GitHub Discussions](https://github.com/keshavdv/unifi-cam-proxy/discussions). - - If you really want to raise an issue, please make sure to follow the template and provide the required information. Failing to do so will most likely end up on the issue being close. Don't take offense at this. It is simply a time management decision. Whenever an issue is raised without following the template and the required information is not provided, very often too much time has to be spent going back and forth to obtain the details that are outlined below. - - - type: textarea - id: description - attributes: - label: Description - description: Is your feature request related to a problem? Please describe. - placeholder: A clear and concise description of what the problem is. E.g. I'm always frustrated when [...] - validations: - required: true - - - type: textarea - id: solution - attributes: - label: How to solve the problem - description: Describe the solution you'd like - placeholder: A clear and concise description of what you would like to happen/exist. - validations: - required: true - - - type: textarea - id: alternatives - attributes: - label: Describe alternatives you've considered - description: What alternatives you've considered and/or tested. - placeholder: A clear and concise description of any alternative solutions, features or tools that you've considered. - validations: - required: false - - - type: textarea - id: other_context - attributes: - label: Additional context - description: Add any other context or screenshots about the feature request here. - placeholder: | - code snnipets - screenshots - mockups - validations: - required: false diff --git a/.github/stale.yml b/.github/stale.yml deleted file mode 100644 index 43385ea..0000000 --- a/.github/stale.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Number of days of inactivity before an issue becomes stale -daysUntilStale: 30 -# Number of days of inactivity before a stale issue is closed -daysUntilClose: 3 -# Issues with these labels will never be considered stale -exemptLabels: - - pinned -# Label to use when marking an issue as stale -staleLabel: stale -# Comment to post when marking an issue as stale. Set to `false` to disable -markComment: > - This issue has been automatically marked as stale because it has not had - recent activity. It will be closed if no further activity occurs. Thank you - for your contributions. -# Comment to post when closing a stale issue. Set to `false` to disable -closeComment: false diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 63bdcfa..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,39 +0,0 @@ -name: Test -on: - push: - branches: [ main ] - paths-ignore: - - docs/** - - .github/workflows/docs.yml - - pull_request: - branches: [ main ] - paths-ignore: - - docs/** - - .github/workflows/docs.yml - - workflow_dispatch: - -jobs: - test: - runs-on: ubuntu-latest - - strategy: - matrix: - python-version: [3.9] - - steps: - - uses: actions/checkout@v3 - - - name: Set up Python ${{ matrix.python-version }} - uses: actions/setup-python@v4 - with: - python-version: ${{ matrix.python-version }} - cache: pip - cache-dependency-path: pyproject.toml - - - name: Install dependencies - run: pip install -e .[test] - - - name: Lint with pre-commit - run: pre-commit run --all-files diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml deleted file mode 100644 index 2cc40c5..0000000 --- a/.github/workflows/docs.yml +++ /dev/null @@ -1,40 +0,0 @@ -name: 📚 Deploy Documentation - -on: - push: - paths: - - docs/** - - .github/workflows/docs.yml - -jobs: - deploy: - runs-on: ubuntu-latest - - steps: - - name: 📂 Checkout - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - - name: 🔵 Setup NodeJS - uses: actions/setup-node@v3 - with: - node-version: 16 - cache: yarn - cache-dependency-path: ./docs/yarn.lock - - - name: ⏬ Install Dependencies - run: yarn install --frozen-lockfile - working-directory: docs - - - name: 🏗 Build - run: yarn build - working-directory: docs - - - name: 🚀 Deploy - uses: peaceiris/actions-gh-pages@v3 - with: - github_token: ${{ secrets.GITHUB_TOKEN }} - publish_dir: docs/build - cname: unifi-cam-proxy.com - if: github.ref == 'refs/heads/main' diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index d47f429..a36e422 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -2,60 +2,35 @@ name: Build Docker image on: push: - branches: main - tags: - - v* - - workflow_dispatch: + branches: [master] jobs: - buildx: - runs-on: ubuntu-latest - + docker: + runs-on: ubuntu-22.04 steps: - - uses: actions/checkout@v3 + - name: Checkout + uses: actions/checkout@v4 - - name: Prepare - id: prep + - name: Install Docker (if not cached) + if: steps.docker-cache.outputs.cache-hit != 'true' run: | - DOCKER_IMAGE=keshavdv/unifi-cam-proxy - VERSION=dev - if [[ $GITHUB_REF == refs/tags/* ]]; then - VERSION=${GITHUB_REF#refs/tags/v} - fi - TAGS="${DOCKER_IMAGE}:${VERSION}" - if [ "${{ github.event_name }}" = "push" ]; then - TAGS="$TAGS,${DOCKER_IMAGE}:sha-${GITHUB_SHA::8}" - fi - if [[ $GITHUB_REF == refs/tags/* ]]; then - TAGS="$TAGS,${DOCKER_IMAGE}:latest" - fi - - echo "version=${VERSION}" >> $GITHUB_OUTPUT - echo "tags=${TAGS}" >> $GITHUB_OUTPUT - echo "created=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT - - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 + wget -q -O /tmp/docker.tgz https://download.docker.com/linux/static/stable/x86_64/docker-20.10.23.tgz \ + && tar --extract --file /tmp/docker.tgz --directory /usr/bin --strip-components 1 --no-same-owner docker/docker \ + && rm -rf /tmp/* && + echo "Done" - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - - name: Login to DockerHub - uses: docker/login-action@v2 + - name: Login to Repo + uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + username: ${{ secrets.REPO_USERNAME }} + password: ${{ secrets.REPO_TOKEN }} - - name: Build and push - uses: docker/build-push-action@v4 + - name: Build and Push (Latest) + uses: docker/build-push-action@v5 with: - context: . - platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7 push: true - tags: ${{ steps.prep.outputs.tags }} - labels: | - org.opencontainers.image.source=${{ github.event.repository.html_url }} - org.opencontainers.image.created=${{ steps.prep.outputs.created }} - org.opencontainers.image.revision=${{ github.sha }} + context: . + tags: fascinated/unifi-cam-proxy:latest