From 64ef2921504c59a5b20f2fc592c1dfac009b8c9d Mon Sep 17 00:00:00 2001 From: Nikita Prokopov Date: Tue, 2 Nov 2021 22:42:25 +0100 Subject: [PATCH] Moved to HubmleUI organization --- .github/workflows/build.yml | 20 ++++++++++---------- README.md | 6 +++--- script/check_release.py | 2 +- script/common.py | 2 +- script/release.py | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 55e795c..fc211e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,7 +29,7 @@ jobs: - run: python3 script/check_release.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} --machine ${{ matrix.machine }} if: ${{ github.event.inputs.skip_release != 'true' }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + API_TOKEN: ${{ secrets.API_TOKEN }} - run: python3 script/checkout.py --version ${{ env.version }} - run: python3 script/build.py --build-type ${{ matrix.build_type }} --machine ${{ matrix.machine }} - run: python3 script/archive.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} --machine ${{ matrix.machine }} @@ -40,7 +40,7 @@ jobs: - run: python3 script/release.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} --machine ${{ matrix.machine }} if: ${{ github.event.inputs.skip_release != 'true' }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + API_TOKEN: ${{ secrets.API_TOKEN }} linux: runs-on: ubuntu-16.04 @@ -54,7 +54,7 @@ jobs: - run: python3 script/check_release.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} if: ${{ github.event.inputs.skip_release != 'true' }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + API_TOKEN: ${{ secrets.API_TOKEN }} - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/checkout.py --version ${{ env.version }} - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/build.py --build-type ${{ matrix.build_type }} - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/archive.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} @@ -65,7 +65,7 @@ jobs: - run: python3 script/release.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} if: ${{ github.event.inputs.skip_release != 'true' }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + API_TOKEN: ${{ secrets.API_TOKEN }} linux-gcc4: runs-on: ubuntu-latest @@ -77,7 +77,7 @@ jobs: - run: python3 script/check_release.py --version ${{ env.version }} --classifier gcc4 if: ${{ github.event.inputs.skip_release != 'true' }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + API_TOKEN: ${{ secrets.API_TOKEN }} - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/checkout.py --version ${{ env.version }} - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/build.py - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/archive.py --version ${{ env.version }} --classifier gcc4 @@ -88,7 +88,7 @@ jobs: - run: python3 script/release.py --version ${{ env.version }} --classifier gcc4 if: ${{ github.event.inputs.skip_release != 'true' }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + API_TOKEN: ${{ secrets.API_TOKEN }} android: runs-on: ubuntu-16.04 @@ -104,7 +104,7 @@ jobs: - run: python3 script/check_release.py --version ${{ env.version }} --system android --machine ${{ matrix.machine }} if: ${{ github.event.inputs.skip_release != 'true' }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + API_TOKEN: ${{ secrets.API_TOKEN }} - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/checkout.py --version ${{ env.version }} --system android --machine ${{ matrix.machine }} - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/build.py --system android --machine ${{ matrix.machine }} --ndk "/usr/local/lib/android/sdk/ndk-bundle" - run: PATH=/usr/lib/binutils-2.26/bin:$PATH python3 script/archive.py --system android --machine ${{ matrix.machine }} @@ -115,7 +115,7 @@ jobs: - run: python3 script/release.py --system android --machine ${{ matrix.machine }} if: ${{ github.event.inputs.skip_release != 'true' }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + API_TOKEN: ${{ secrets.API_TOKEN }} windows: runs-on: windows-2019 @@ -129,7 +129,7 @@ jobs: run: python3 script/check_release.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} if: ${{ github.event.inputs.skip_release != 'true' }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + API_TOKEN: ${{ secrets.API_TOKEN }} - uses: microsoft/setup-msbuild@v1 - uses: ilammy/msvc-dev-cmd@v1 - shell: bash @@ -146,4 +146,4 @@ jobs: run: python3 script/release.py --version ${{ env.version }} --build-type ${{ matrix.build_type }} if: ${{ github.event.inputs.skip_release != 'true' }} env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + API_TOKEN: ${{ secrets.API_TOKEN }} diff --git a/README.md b/README.md index 8c1b502..c6c5832 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ # Automated Skia builds -This repo is dedicated to building Skia binaries for use in [Skija](https://github.com/JetBrains/skija) and [Skiko](https://github.com/JetBrains/skiko). +This repo is dedicated to building Skia binaries for use in [Skija](https://github.com/HumbleUI/Skija). ## Prebuilt binaries -Prebuilt binaries can be found [in releases](https://github.com/JetBrains/skia-build/releases). +Prebuilt binaries can be found [in releases](https://github.com/HumbleUI/SkiaBuild/releases). ## Building next version of Skia -Update `version` in [.github/workflows/build.yml](https://github.com/JetBrains/skia-build/blob/master/.github/workflows/build.yml). +Update `version` in [.github/workflows/build.yml](https://github.com/HumbleUI/SkiaBuild/blob/master/.github/workflows/build.yml). ## Building locally diff --git a/script/check_release.py b/script/check_release.py index 10b1746..2bc0925 100755 --- a/script/check_release.py +++ b/script/check_release.py @@ -11,7 +11,7 @@ def main(): classifier = common.classifier() try: - resp = urllib.request.urlopen(urllib.request.Request('https://api.github.com/repos/JetBrains/skia-build/releases/tags/' + version, headers=headers)).read() + resp = urllib.request.urlopen(urllib.request.Request('https://api.github.com/repos/HubmleUI/SkiaBuild/releases/tags/' + version, headers=headers)).read() artifacts = [x['name'] for x in json.loads(resp.decode('utf-8'))['assets']] zip = 'Skia-' + version + '-' + system + '-' + build_type + '-' + machine + classifier + '.zip' if zip in artifacts: diff --git a/script/common.py b/script/common.py index 763b11c..c36c8bc 100644 --- a/script/common.py +++ b/script/common.py @@ -49,7 +49,7 @@ def github_headers(): if os.environ.get('GITHUB_BASIC'): auth = 'Basic ' + base64.b64encode(os.environ.get('GITHUB_BASIC').encode('utf-8')).decode('utf-8') else: - auth = 'token ' + os.environ.get('GITHUB_TOKEN') + auth = 'token ' + os.environ.get('API_TOKEN') return { 'Accept': 'application/vnd.github.v3+json', 'Authorization': auth diff --git a/script/release.py b/script/release.py index 686ae84..2916390 100755 --- a/script/release.py +++ b/script/release.py @@ -19,10 +19,10 @@ def main(): headers = common.github_headers() try: - resp = urllib.request.urlopen(urllib.request.Request('https://api.github.com/repos/JetBrains/skia-build/releases/tags/' + version, headers=headers)).read() + resp = urllib.request.urlopen(urllib.request.Request('https://api.github.com/repos/HumbleUI/SkiaBuild/releases/tags/' + version, headers=headers)).read() except urllib.error.URLError as e: data = '{"tag_name":"' + version + '","name":"' + version + '"}' - resp = urllib.request.urlopen(urllib.request.Request('https://api.github.com/repos/JetBrains/skia-build/releases', data=data.encode('utf-8'), headers=headers)).read() + resp = urllib.request.urlopen(urllib.request.Request('https://api.github.com/repos/HumbleUI/SkiaBuild/releases', data=data.encode('utf-8'), headers=headers)).read() upload_url = re.match('https://.*/assets', json.loads(resp.decode('utf-8'))['upload_url']).group(0) print('Uploading', zip, 'to', upload_url)