diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index cde0ccd77..5b6c099d8 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -44,31 +44,15 @@ jobs: steps: - uses: actions/checkout@v3 + # - uses: actions/setup-go@v4 - uses: erezrokah/setup-go@feat/add_cache_prefix with: go-version: ^1.20 cache-key-prefix: build-cache- id: go - - uses: actions/setup-node@v3 - with: - node-version: "18" - cache: "npm" - - - name: Install UI - run: make install-ui - - - name: Build UI - run: make ui - - name: Build - run: make build - - - name: Upload - uses: actions/upload-artifact@v3 - with: - name: evcc-binary - path: ./evcc + run: mkdir dist && touch dist/empty && make build test: name: Test @@ -108,7 +92,7 @@ jobs: version: latest args: --timeout 5m - ui: + build-ui: name: UI runs-on: ubuntu-latest @@ -120,7 +104,7 @@ jobs: node-version: "18" cache: "npm" - - name: Install + - name: Install tools run: make install-ui - name: Lint @@ -129,48 +113,12 @@ jobs: - name: Test run: make test-ui - - name: Porcelain - run: | - test -z "$(git status --porcelain)" || (git status; git diff; false) + - name: Build + run: make ui - integration: - name: Integration - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v3 - - - uses: actions/setup-node@v3 + - name: Cache dist + uses: actions/cache/save@v3 + id: cache-dist with: - node-version: "18" - cache: "npm" - - - name: Install npm - run: npm ci - - - run: npx playwright install --with-deps chromium - - - name: Wait for Build - uses: lewagon/wait-on-check-action@v1.3.1 - with: - ref: ${{ github.event.pull_request.head.sha || github.sha }} - check-name: Build - repo-token: ${{ secrets.GITHUB_TOKEN }} - wait-interval: 10 - - - uses: actions/download-artifact@v3 - with: - name: evcc-binary - - - name: Make executable - run: chmod +x evcc - - - name: Run tests - run: npx playwright test - - - uses: actions/upload-artifact@v3 - if: always() - with: - name: playwright-report - path: playwright-report/ - retention-days: 30 + path: dist + key: ${{ runner.os }}-${{ github.sha }}-dist diff --git a/.gitignore b/.gitignore index 5d5fc691e..9da0cd4c1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,6 @@ __debug_bin !util/templates/**/*.yaml !package*.json !evcc.dist.yaml -!tests/**/*.evcc.yaml evcc evcc.exe evcc_* @@ -33,6 +32,3 @@ fly.toml vendor/* QEMU_EFI.fd asset-stats.html -/test-results/ -/playwright-report/ -/playwright/.cache/ diff --git a/assets/js/components/Energyflow/Visualization.vue b/assets/js/components/Energyflow/Visualization.vue index 53aa89d14..57745dd67 100644 --- a/assets/js/components/Energyflow/Visualization.vue +++ b/assets/js/components/Energyflow/Visualization.vue @@ -1,9 +1,5 @@