Resolve merge conflict for tag 0.300.6.0

.devcontainer/devcontainer.json

@@ -2,7 +2,7 @@
 // README at: https://github.com/devcontainers/templates/tree/main/src/go
 {
 	"name": "evcc",
-	"image": "mcr.microsoft.com/devcontainers/go",
+	"image": "mcr.microsoft.com/devcontainers/go:2-1.25-bookworm",
 	"features": {
 		"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {
 			"moby": false,

.github/workflows/_claude-issue-triage.yml_

@@ -6,7 +6,7 @@ on:
 
 jobs:
   triage-issue:
-    runs-on: depot-ubuntu-24.04-arm
+    runs-on: ubuntu-24.04
     timeout-minutes: 10
     permissions:
       contents: read

.github/workflows/default.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   clean:
     name: Clean
-    runs-on: depot-ubuntu-24.04-arm
+    runs-on: ubuntu-24.04
 
     permissions:
       contents: read
@@ -50,7 +50,7 @@ jobs:
 
   build:
     name: Build
-    runs-on: depot-ubuntu-24.04-arm
+    runs-on: ubuntu-24.04
 
     permissions:
       contents: read
@@ -88,7 +88,7 @@ jobs:
 
   test:
     name: Test
-    runs-on: depot-ubuntu-24.04-arm
+    runs-on: ubuntu-24.04
 
     permissions:
       contents: read
@@ -119,7 +119,7 @@ jobs:
 
   lint:
     name: Lint
-    runs-on: depot-ubuntu-24.04-arm
+    runs-on: ubuntu-24.04
 
     permissions:
       contents: read
@@ -161,7 +161,7 @@ jobs:
     permissions:
       contents: read
       actions: write
-    runs-on: depot-ubuntu-24.04-arm
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v6
@@ -203,7 +203,7 @@ jobs:
 
   integration:
     name: Integration
-    runs-on: depot-ubuntu-24.04-arm-32
+    runs-on: ubuntu-24.04
 
     permissions:
       contents: read

.github/workflows/docs-issue.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   check-label-and-create-issue:
-    runs-on: depot-ubuntu-24.04-arm
+    runs-on: ubuntu-24.04
     if: github.event.pull_request.merged == true && github.event.pull_request.base.repo.full_name == github.event.pull_request.head.repo.full_name
     steps:
       - name: Check for 'needs documentation' label

.github/workflows/nightly.yml

@@ -1,63 +1,68 @@
 name: Nightly Build
 permissions:
   contents: read
+  packages: write
 
 on:
   schedule: # runs on the default branch: master
-    - cron: "0 2 * * *" # run at 2 AM UTC
+    - cron: "10 20 * * *" # run at 6:10 AM
   workflow_dispatch:
 
 jobs:
-  check_date:
-    runs-on: depot-ubuntu-24.04-arm
-    name: Check latest commit
-
-    permissions:
-      contents: read
-    outputs:
-      should_run: ${{ steps.should_run.outputs.should_run }}
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          persist-credentials: false
-      - name: print latest_commit
-        run: echo ${{ github.sha }}
-
-      - id: should_run
-        continue-on-error: true
-        name: check latest commit is less than a day
-        if: ${{ github.event_name == 'schedule' }}
-        run: test -z $(git rev-list  --after="24 hours" ${{ github.sha }}) && echo "should_run=false" >> $GITHUB_OUTPUT
-
-  call-build-workflow:
-    name: Call Build
-    needs: check_date
-    if: |
-      ${{ needs.check_date.outputs.should_run != 'false' }}
-      && startsWith(github.ref, 'refs/heads/master')
-      && ! contains(github.head_ref, 'refs/heads/chore/')
-    uses: evcc-io/evcc/.github/workflows/default.yml@master
-    permissions:
-      contents: read
-      actions: write
+  # check_date:
+  #   runs-on: ubuntu-latest
+  #   name: Check latest commit
+  #   outputs:
+  #     should_run: ${{ steps.should_run.outputs.should_run }}
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - name: print latest_commit
+  #       run: echo ${{ github.sha }}
+
+  #     - id: should_run
+  #       continue-on-error: true
+  #       name: check latest commit is less than a day
+  #       if: ${{ github.event_name == 'schedule' }}
+  #       run: test -z $(git rev-list  --after="24 hours" ${{ github.sha }}) && echo "should_run=false" >> $GITHUB_OUTPUT
+
+  # call-build-workflow:
+  #   name: Call Build
+  #   needs: check_date
+  #   if: |
+  #     ${{ needs.check_date.outputs.should_run != 'false' }}
+  #     && startsWith(github.ref, 'refs/heads/master')
+  #     && ! contains(github.head_ref, 'refs/heads/chore/')
+  #   uses: evcc-io/evcc/.github/workflows/default.yml@master
 
   docker:
     name: Publish Docker :nightly
-    needs:
-      - call-build-workflow
-    runs-on: depot-ubuntu-24.04-arm
+    # needs:
+    #   - call-build-workflow
+    runs-on: ubuntu-latest
 
     permissions:
       contents: read
       actions: read
+      packages: write
 
     steps:
       - uses: actions/checkout@v6
         with:
-          ref: refs/heads/master # force master
+          ref: refs/heads/evcc-master # force master
           fetch-depth: 0
           persist-credentials: false
 
+      - name: Set up Git
+        run: |
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+
+      - name: Merge our master branch into evcc-master for building
+        run: |
+          git merge origin/master --no-commit --no-ff || true
+          git reset -- .github/workflows
+          git commit -m "merge from evcc/master"
+
       - name: Get dist from cache
         uses: actions/cache/restore@v5
         id: cache-dist
@@ -68,8 +73,9 @@ jobs:
       - name: Login
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASS }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Setup Buildx
         uses: docker/setup-buildx-action@v3
@@ -78,7 +84,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: evcc/evcc
+          images: ghcr.io/jeffborg/evcc
           tags: |
             type=raw,value=nightly
             type=raw,value=nightly.{{date 'YYYYMMDD'}}-{{sha}}
@@ -93,93 +99,17 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
 
-      - name: Delete old nightly.* tags
-        run: |
-          old_tags=$(curl -s "https://hub.docker.com/v2/repositories/evcc/evcc/tags/?page_size=100" | jq -r '.results | map(select(.name | startswith("nightly."))) | sort_by(.last_updated) | reverse | .[1:] | .[].name')
-          for tag in $old_tags; do
-            echo "Deleting tag: $tag"
-            curl -s -H "Authorization: Bearer ${{ secrets.DOCKER_PASS }}" -X DELETE "https://hub.docker.com/v2/repositories/evcc/evcc/tags/$tag/"
-          done
-
-  hassio:
-    name: Hassio Addon :nightly
-    needs:
-      - docker
-    runs-on: depot-ubuntu-24.04-arm
-
-    permissions:
-      contents: read
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-        with:
-          repository: evcc-io/hassio-addon
-          token: ${{ secrets.HASSIO_DEPLOY_TOKEN }}
-          path: ./hassio
-
-      - name: Update version
-        run: |
-          current_date=$(date +%Y%m%d)
-          short_sha=$(echo "${{ github.sha }}" | cut -c 1-7)
-          sed -i -e "s/version:.*/version: nightly.${current_date}-${short_sha}/" ./hassio/evcc-nightly/config.yaml
-
-      - name: Push
-        run: |
-          cd ./hassio
-          git add .
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-          git commit -am "Mirror evcc nightly release"
-          git push
-
-  apt:
-    name: Publish APT nightly
-    needs:
-      - call-build-workflow
-    runs-on: depot-ubuntu-24.04-arm
-
-    permissions:
-      contents: read
-      actions: read
-
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          persist-credentials: false
-
-      - uses: actions/setup-go@v6
-        with:
-          go-version-file: go.mod
-        id: go
-
-      - name: Patch ASN1
-        run: make patch-asn1-sudo
-
-      - name: Get dist from cache
-        uses: actions/cache/restore@v5
-        id: cache-dist
-        with:
-          path: dist
-          key: ${{ runner.os }}-${{ github.sha }}-dist
-
-      - name: Create nightly build
-        uses: goreleaser/goreleaser-action@v6
-        with:
-          version: '~> v2'
-          args: --snapshot -f .goreleaser-nightly.yml --clean
+      - name: Delete old nightly.* tags from GHCR
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - uses: actions/setup-python@v6
-        with:
-          python-version: 3.12
+          GHCR_USERNAME: ${{ github.actor }}
+          GHCR_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Or use a PAT with 'write:packages' scope
+        run: |
+          repo="ghcr.io/jeffborg/evcc"
+          tags=$(curl -s -H "Authorization: Bearer $GHCR_TOKEN" "https://api.github.com/users/jeffborg/packages/container/evcc/versions" | jq -r '.[] | select(.metadata.container.tags[] | startswith("nightly.")) | {id: .id, updated_at: .updated_at} | @base64')
 
-      - name: Install Cloudsmith CLI
-        run: pip install --upgrade cloudsmith-cli
+          sorted_tags=$(echo "$tags" | base64 --decode | jq -s 'sort_by(.updated_at) | reverse | .[2:]')
 
-      - name: Publish .deb to Cloudsmith
-        env:
-          CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
-        run: make apt-nightly
+          for tag in $(echo "$sorted_tags" | jq -r '.[].id'); do
+            echo "Deleting tag ID: $tag"
+            curl -s -X DELETE -H "Authorization: Bearer $GHCR_TOKEN" "https://api.github.com/users/jeffborg/packages/container/evcc/versions/$tag"
+          done