From 136bc2f4b6e29916e8223ddf4a95ce9e7b83d974 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Fri, 6 Dec 2024 19:00:31 +0100 Subject: [PATCH] pioarduino changes --- .github/workflows/dangerjs.yml | 27 ---------- .github/workflows/docker.yml | 87 ------------------------------ .github/workflows/release_zips.yml | 4 +- package.json | 23 ++++++++ version.txt | 1 + 5 files changed, 26 insertions(+), 116 deletions(-) delete mode 100644 .github/workflows/dangerjs.yml delete mode 100644 .github/workflows/docker.yml create mode 100644 package.json create mode 100644 version.txt diff --git a/.github/workflows/dangerjs.yml b/.github/workflows/dangerjs.yml deleted file mode 100644 index 07871a79a9a0..000000000000 --- a/.github/workflows/dangerjs.yml +++ /dev/null @@ -1,27 +0,0 @@ -name: DangerJS Pull Request review - -on: - pull_request_target: - types: [opened, edited, reopened, synchronize] - -permissions: - pull-requests: write - contents: write - -jobs: - pull-request-style-linter: - runs-on: ubuntu-latest - steps: - - name: Check out PR head - uses: actions/checkout@v4 - with: - ref: ${{ github.event.pull_request.head.sha }} - - - name: DangerJS pull request linter - uses: espressif/shared-github-dangerjs@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - instructions-gitlab-mirror: 'true' - instructions-contributions-file: 'CONTRIBUTING.md' - instructions-cla-link: 'https://cla-assistant.io/espressif/esp-idf' diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml deleted file mode 100644 index 88deb00f9b46..000000000000 --- a/.github/workflows/docker.yml +++ /dev/null @@ -1,87 +0,0 @@ -name: docker - -concurrency: - group: ${{ github.workflow }}-${{ github.ref }} - -on: - push: - branches: - - 'master' - - 'release/*' - tags: - - 'v*.*' - -env: - # Platforms to build the image for - BUILD_PLATFORMS: linux/amd64,linux/arm64 - DOCKERHUB_REPO: ${{ github.repository_owner }}/idf - -jobs: - docker: - # Disable the job in forks - if: ${{ github.repository_owner == 'espressif' }} - - runs-on: ubuntu-latest - steps: - # Depending on the branch/tag, set CLONE_BRANCH_OR_TAG variable (used in the Dockerfile - # as a build arg) and TAG_NAME (used when tagging the image). - # - # The following 3 steps cover the alternatives (tag, release branch, master branch): - - name: Set variables (tags) - if: ${{ github.ref_type == 'tag' }} - run: | - echo "CLONE_BRANCH_OR_TAG=$GITHUB_REF_NAME" >> $GITHUB_ENV - echo "TAG_NAME=$GITHUB_REF_NAME" >> $GITHUB_ENV - - name: Set variables (release branches) - if: ${{ github.ref_type == 'branch' && startsWith(github.ref_name, 'release/') }} - run: | - echo "CLONE_BRANCH_OR_TAG=$GITHUB_REF_NAME" >> $GITHUB_ENV - echo "TAG_NAME=release-${GITHUB_REF_NAME##release/}" >> $GITHUB_ENV - - name: Set variables (main branch) - if: ${{ github.ref_type == 'branch' && github.ref_name == 'master' }} - run: | - echo "CLONE_BRANCH_OR_TAG=master" >> $GITHUB_ENV - echo "TAG_NAME=latest" >> $GITHUB_ENV - - # Display the variables set above, just in case. - - name: Check variables - run: | - echo "CLONE_BRANCH_OR_TAG: $CLONE_BRANCH_OR_TAG" - echo "CHECKOUT_REF: $CHECKOUT_REF" - echo "TAG_NAME: $TAG_NAME" - - # The following steps are the standard boilerplate from - # https://github.com/marketplace/actions/build-and-push-docker-images - - name: Checkout - uses: actions/checkout@v3 - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - name: Set up QEMU for multiarch builds - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Build and push - uses: docker/build-push-action@v3 - with: - context: tools/docker - push: true - tags: ${{ env.DOCKERHUB_REPO }}:${{ env.TAG_NAME }} - platforms: ${{ env.BUILD_PLATFORMS }} - build-args: | - IDF_CLONE_URL=${{ github.server_url }}/${{ github.repository }}.git - IDF_CLONE_BRANCH_OR_TAG=${{ env.CLONE_BRANCH_OR_TAG }} - - - name: Update Docker Hub repository description (master branch) - if: ${{ github.ref_type == 'branch' && github.ref_name == 'master' }} - uses: peter-evans/dockerhub-description@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - # Token based authentication is not supported here: - # https://github.com/peter-evans/dockerhub-description/issues/10 - # https://github.com/docker/roadmap/issues/115#issuecomment-891694974 - password: ${{ secrets.DOCKERHUB_PASSWORD }} - repository: ${{ env.DOCKERHUB_REPO }} - readme-filepath: ./tools/docker/README.md diff --git a/.github/workflows/release_zips.yml b/.github/workflows/release_zips.yml index a88dd90128e8..ccce907041e8 100644 --- a/.github/workflows/release_zips.yml +++ b/.github/workflows/release_zips.yml @@ -10,8 +10,8 @@ jobs: name: Create release zip file runs-on: ubuntu-20.04 steps: - - name: Create a recursive clone source zip - uses: espressif/github-actions/release_zips@master + - name: Create a recursive clone source and stripped zip + uses: Jason2866/github-actions/release_zips@release_idf env: RELEASE_PROJECT_NAME: ESP-IDF GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/package.json b/package.json new file mode 100644 index 000000000000..4354d308b995 --- /dev/null +++ b/package.json @@ -0,0 +1,23 @@ +{ + "name": "framework-espidf", + "version": "3.50500", + "description": "Espressif IoT Development Framework for ESP32x based chip series", + "keywords": [ + "framework", + "esp32", + "esp32s2", + "esp32s3", + "esp32c2", + "esp32c3", + "esp32c6", + "esp32h2", + "esp32p4", + "espressif" + ], + "homepage": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32/", + "license": "Apache-2.0", + "repository": { + "type": "git", + "url": "https://github.com/espressif/esp-idf" + } +} diff --git a/version.txt b/version.txt new file mode 100644 index 000000000000..755268a3c3c1 --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ +5.5.0.20241205