Skip to content

Commit

Permalink
Moved to HubmleUI organization
Browse files Browse the repository at this point in the history
  • Loading branch information
@tonsky
tonsky committed Nov 2, 2021
1 parent 3b8a2b7 commit 64ef292
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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
Expand All @@ -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 }}
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 }}
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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 }}
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion script/check_release.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion script/common.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions script/release.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 64ef292

Please sign in to comment.