Merge branch 'master' into feature/GH-9_Add_release_ID_to_outputs

README.md

@@ -164,6 +164,7 @@ jobs:
           body_path: ${{ github.workflow }}-CHANGELOG.txt
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_REPOSITORY: my_gh_org/my_gh_repo
 ```
 
 ### 💅 Customizing
@@ -193,6 +194,8 @@ The following outputs can be accessed via `${{ steps.<step-id>.outputs }}` from
 |-------------|---------|-----------------------------------------------------------------|
 | `url`       | String  | Github.com URL for the release                                  |
 | `id`        | String  | Release ID                                                      |
+| `upload_url`| String  | URL for uploading assets to the release                         |
+
 
 #### environment variables
 
@@ -201,6 +204,7 @@ The following are *required* as `step.env` keys
 | Name           | Description                          |
 |----------------|--------------------------------------|
 | `GITHUB_TOKEN` | GITHUB_TOKEN as provided by `secrets`|
+| `GITHUB_REPOSITORY` | Name of a target repository in `<owner>/<repo>` format. defaults to the current repository|
 
 
 > **⚠️ Note:** This action was previously implemented as a Docker container, limiting its use to GitHub Actions Linux virtual environments only. With recent releases, we now support cross platform usage. You'll need to remove the `docker://` prefix in these versions

__tests__/util.test.ts

@@ -58,9 +58,9 @@ describe("util", () => {
         })
       );
     });
-    it("defaults to body when both body and body path are provided", () => {
+    it("defaults to body path when both body and body path are provided", () => {
       assert.equal(
-        "foo",
+        "bar",
         releaseBody({
           github_ref: "",
           github_repository: "",

action.yml

@@ -27,6 +27,9 @@ inputs:
   fail_on_unmatched_files:
     description: 'Fails if any of the `files` globs match nothing. Defaults to false'
     required: false
+  repository:
+    description: 'Repository to make releases against, in <owner>/<repo> format'
+    required: false
 env:
   'GITHUB_TOKEN': 'As provided by Github Actions'
 outputs:
@@ -34,9 +37,11 @@ outputs:
     description: 'URL to the Release HTML Page'
   id:
     description: 'Release ID'
+  upload_url:
+    description: 'URL for uploading assets to the release'
 runs:
   using: 'node12'
   main: 'dist/index.js'
 branding:
   color: 'green'
-  icon: 'package'
+  icon: 'package'

package-lock.json

@@ -5,9 +5,9 @@
   "requires": true,
   "dependencies": {
     "@actions/core": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.0.tgz",
-      "integrity": "sha512-ZKdyhlSlyz38S6YFfPnyNgCDZuAF2T0Qv5eHflNWytPS8Qjvz39bZFMry9Bb/dpSnqWcNeav5yM2CTYpJeY+Dw=="
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.6.tgz",
+      "integrity": "sha512-ZQYitnqiyBc3D+k7LsgSBmMDVkOVidaagDG7j3fOym77jNunWRuYx7VSHa9GNfFZh+zh61xsCjRj4JxMZlDqTA=="
     },
     "@actions/github": {
       "version": "2.0.0",
@@ -3708,9 +3708,9 @@
       "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
     },
     "node-fetch": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.0.tgz",
-      "integrity": "sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA=="
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz",
+      "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw=="
     },
     "node-int64": {
       "version": "0.4.0",

package.json

@@ -20,7 +20,7 @@
   "author": "softprops",
   "license": "MIT",
   "dependencies": {
-    "@actions/core": "^1.2.0",
+    "@actions/core": "^1.2.6",
     "@actions/github": "^2.0.0",
     "@octokit/plugin-retry": "^3.0.2",
     "@octokit/plugin-throttling": "^3.2.1",

src/main.ts

@@ -56,6 +56,7 @@ async function run() {
     console.log(`🎉 Release ready at ${rel.html_url}`);
     setOutput("url", rel.html_url);
     setOutput("id", rel.id.toString());
+    setOutput("upload_url", rel.upload_url);
   } catch (error) {
     setFailed(error.message);
   }

src/util.ts

@@ -8,6 +8,7 @@ export interface Config {
   // user provided
   input_name?: string;
   input_tag_name?: string;
+  input_repository?: string;
   input_body?: string;
   input_body_path?: string;
   input_files?: string[];
@@ -18,9 +19,9 @@ export interface Config {
 
 export const releaseBody = (config: Config): string | undefined => {
   return (
-    config.input_body ||
     (config.input_body_path &&
-      readFileSync(config.input_body_path).toString("utf8"))
+      readFileSync(config.input_body_path).toString("utf8")) ||
+    config.input_body
   );
 };
 
@@ -41,7 +42,7 @@ export const parseConfig = (env: Env): Config => {
   return {
     github_token: env.GITHUB_TOKEN || "",
     github_ref: env.GITHUB_REF || "",
-    github_repository: env.GITHUB_REPOSITORY || "",
+    github_repository: env.INPUT_REPOSITORY || env.GITHUB_REPOSITORY || "",
     input_name: env.INPUT_NAME,
     input_tag_name: env.INPUT_TAG_NAME,
     input_body: env.INPUT_BODY,