diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7f021f6..9cd2c4a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -2,38 +2,14 @@ name: Release on: push: - tags: - - '[0-9]+.[0-9]+.[0-9]+' + branches: + - test jobs: - create-release: - runs-on: ubuntu-latest - steps: - - name: Create Release - id: create_release - uses: actions/create-release@v1.0.0 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} - draft: false - prerelease: false - - name: Dump upload url to file - run: echo '${{ steps.create_release.outputs.upload_url }}' > upload_url - - name: Upload upload_url - uses: actions/upload-artifact@v1 - with: - name: upload_url - path: upload_url - build: - needs: create-release strategy: matrix: platform: [ - 'linux-arm', - 'linux-arm64', 'linux-x64', ] pair: [ @@ -61,14 +37,6 @@ jobs: runs-on: ${{ matrix.host-os }} steps: - - name: Download upload_url - uses: actions/download-artifact@v1 - with: - name: upload_url - - name: Set upload_url - run: echo "UPLOAD_URL=$(cat upload_url/upload_url)" >> $GITHUB_ENV - - name: Set release version - run: echo "RELEASE_VERSION=${GITHUB_REF:10}" >> $GITHUB_ENV - uses: actions/checkout@v2 - name: Use Node.js ${{ matrix.version }} uses: actions/setup-node@v4 @@ -77,23 +45,3 @@ jobs: - name: Build adapter run: | ./build.sh "${{ matrix.platform }}" "${{ matrix.language }}" "${{ matrix.version }}" - - name: Upload Release Asset - id: upload-release-asset - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ env.UPLOAD_URL }} - asset_path: zigbee-adapter-${{ env.RELEASE_VERSION }}-${{ matrix.platform }}-v${{ matrix.version }}.tgz - asset_name: zigbee-adapter-${{ env.RELEASE_VERSION }}-${{ matrix.platform }}-v${{ matrix.version }}.tgz - asset_content_type: application/gnutar - - name: Upload Release Asset Checksum - id: upload-release-asset-checksum - uses: actions/upload-release-asset@v1.0.1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ env.UPLOAD_URL }} - asset_path: zigbee-adapter-${{ env.RELEASE_VERSION }}-${{ matrix.platform }}-v${{ matrix.version }}.tgz.sha256sum - asset_name: zigbee-adapter-${{ env.RELEASE_VERSION }}-${{ matrix.platform }}-v${{ matrix.version }}.tgz.sha256sum - asset_content_type: text/plain diff --git a/build.sh b/build.sh index 4e256e9..7230cb1 100755 --- a/build.sh +++ b/build.sh @@ -56,7 +56,9 @@ function build_native() { } function build_cross_compiled() { - docker run --rm -t -v $PWD:/build webthingsio/toolchain-${ADDON_ARCH}-${LANGUAGE_NAME}-${LANGUAGE_VERSION} bash -c "cd /build; ADDON_ARCH=${ADDON_ARCH} ./package.sh" + echo $UID + whoami + docker run --rm -t --user 0 -v $PWD:/build webthingsio/toolchain-${ADDON_ARCH}-${LANGUAGE_NAME}-${LANGUAGE_VERSION} bash -c "echo $UID; cd /build; ADDON_ARCH=${ADDON_ARCH} ./package.sh" } case "${ADDON_ARCH}" in