Skip to content

Commit 9b335d9

Browse files
committed
Fix osx build and upload URLs
1 parent 8c843c9 commit 9b335d9

File tree

2 files changed

+26
-21
lines changed

2 files changed

+26
-21
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ env:
77

88
jobs:
99
build:
10-
1110
runs-on: ubuntu-latest
1211

1312
steps:

.github/workflows/release.yml

Lines changed: 26 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,8 @@ name: Create Release
22

33
on:
44
push:
5-
# Sequence of patterns matched against refs/tags
65
tags:
7-
- 'v*' # Push events to matching v*, i.e. v1.0, v20.15.10
8-
6+
- 'v*'
97
jobs:
108
create:
119
runs-on: ubuntu-18.04
@@ -20,14 +18,27 @@ jobs:
2018
release_name: Release ${{ github.ref }}
2119
body: |
2220
Release ${{ github.ref }}
23-
draft: false
24-
prerelease: false
21+
draft: true
22+
prerelease: true
23+
- run: |
24+
echo "${{ steps.create_release.outputs.upload_url }}" > release-upload-url.txt
25+
- uses: actions/upload-artifact@v2
26+
with:
27+
name: release-upload-url
28+
path: release-upload-url.txt
2529
build-nix:
2630
runs-on: ubuntu-18.04
2731
needs: create
2832
steps:
2933
- name: Checkout code
3034
uses: actions/checkout@v2
35+
- uses: actions/download-artifact@v2
36+
with:
37+
name: release-upload-url
38+
path: release-upload-url.txt
39+
- id: release_info
40+
run: |
41+
echo ::set-output name=upload_url::$(cat release-upload-url.txt/release-upload-url.txt)
3142
- name: Compile Binary
3243
run: cargo build --release
3344
- name: Upload Release Asset
@@ -36,28 +47,23 @@ jobs:
3647
env:
3748
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
3849
with:
39-
upload_url: ${{ steps.create_release.outputs.upload_url }}
50+
upload_url: ${{ steps.release_info.outputs.upload_url }}
4051
asset_path: target/release/scribe
4152
asset_name: scribe-linux
42-
asset_content_type: application/binary
53+
asset_content_type: binary/octet-stream
4354
build-osx:
4455
runs-on: macos-10.15
4556
needs: create
4657
steps:
4758
- name: Checkout code
4859
uses: actions/checkout@v2
49-
- name: Create Release
50-
id: create_release
51-
uses: actions/create-release@v1
52-
env:
53-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
60+
- uses: actions/download-artifact@v2
5461
with:
55-
tag_name: ${{ github.ref }}
56-
release_name: Release ${{ github.ref }}
57-
body: |
58-
Release ${{ github.ref }}
59-
draft: false
60-
prerelease: false
62+
name: release-upload-url
63+
path: release-upload-url.txt
64+
- id: release_info
65+
run: |
66+
echo ::set-output name=upload_url::$(cat release-upload-url.txt/release-upload-url.txt)
6167
- name: Compile Binary
6268
run: cargo build --release
6369
- name: Upload Release Asset
@@ -66,7 +72,7 @@ jobs:
6672
env:
6773
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6874
with:
69-
upload_url: ${{ steps.create_release.outputs.upload_url }}
75+
upload_url: ${{ steps.release_info.outputs.upload_url }}
7076
asset_path: target/release/scribe
7177
asset_name: scribe-darwin
72-
asset_content_type: application/binary
78+
asset_content_type: binary/octet-stream

0 commit comments

Comments
 (0)