[pull] master from Roblox:master

.eslintrc.json

@@ -1,54 +1,13 @@
 {
     "plugins": ["jest", "@typescript-eslint"],
-    "extends": ["plugin:github/es6"],
+    "extends": ["plugin:github/typescript"],
     "parser": "@typescript-eslint/parser",
     "parserOptions": {
       "ecmaVersion": 9,
       "sourceType": "module",
       "project": "./tsconfig.json"
     },
-    "rules": {
-      "eslint-comments/no-use": "off",
-      "import/no-namespace": "off",
-      "no-unused-vars": "off",
-      "@typescript-eslint/no-unused-vars": "error",
-      "@typescript-eslint/explicit-member-accessibility": ["error", {"accessibility": "no-public"}],
-      "@typescript-eslint/no-require-imports": "error",
-      "@typescript-eslint/array-type": "error",
-      "@typescript-eslint/await-thenable": "error",
-      "@typescript-eslint/ban-ts-ignore": "error",
-      "camelcase": "off",
-      "@typescript-eslint/camelcase": "error",
-      "@typescript-eslint/class-name-casing": "error",
-      "@typescript-eslint/explicit-function-return-type": ["error", {"allowExpressions": true}],
-      "@typescript-eslint/func-call-spacing": ["error", "never"],
-      "@typescript-eslint/generic-type-naming": ["error", "^[A-Z][A-Za-z]*$"],
-      "@typescript-eslint/no-array-constructor": "error",
-      "@typescript-eslint/no-empty-interface": "error",
-      "@typescript-eslint/no-explicit-any": "error",
-      "@typescript-eslint/no-extraneous-class": "error",
-      "@typescript-eslint/no-for-in-array": "error",
-      "@typescript-eslint/no-inferrable-types": "error",
-      "@typescript-eslint/no-misused-new": "error",
-      "@typescript-eslint/no-namespace": "error",
-      "@typescript-eslint/no-non-null-assertion": "warn",
-      "@typescript-eslint/no-object-literal-type-assertion": "error",
-      "@typescript-eslint/no-unnecessary-qualifier": "error",
-      "@typescript-eslint/no-unnecessary-type-assertion": "error",
-      "@typescript-eslint/no-useless-constructor": "error",
-      "@typescript-eslint/no-var-requires": "error",
-      "@typescript-eslint/prefer-for-of": "warn",
-      "@typescript-eslint/prefer-function-type": "warn",
-      "@typescript-eslint/prefer-includes": "error",
-      "@typescript-eslint/prefer-interface": "error",
-      "@typescript-eslint/prefer-string-starts-ends-with": "error",
-      "@typescript-eslint/promise-function-async": "error",
-      "@typescript-eslint/require-array-sort-compare": "error",
-      "@typescript-eslint/restrict-plus-operands": "error",
-      "semi": "error",
-      "@typescript-eslint/type-annotation-spacing": "error",
-      "@typescript-eslint/unbound-method": "error"
-    },
+    "rules": {},
     "env": {
       "node": true,
       "es6": true,

.github/workflows/clabot.yml

@@ -6,16 +6,10 @@ on:
     types: [opened,closed,synchronize]
 
 jobs:
-  clabot:
-    runs-on: ubuntu-latest
-    steps:
-    - name: "CLA Signature Bot"
-      uses: roblox/[email protected]
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        whitelist: "LPGhatguy,ZoteTheMighty,cliffchapmanrbx,MagiMaster,MisterUncloaked,amatosov-rbx,dependabot[bot]"
-        use-remote-repo: true
-        remote-repo-name: "roblox/cla-bot-store"
-        remote-repo-pat: ${{ secrets.CLA_REMOTE_REPO_PAT }}
-        url-to-cladocument: "https://roblox.github.io/cla-bot-store/"
+  call-clabot-workflow:
+    uses: Roblox/cla-signature-bot/.github/workflows/clabot-workflow.yml@master
+    with:
+      whitelist: "LPGhatguy,ZoteTheMighty,cliffchapmanrbx,MagiMaster,MisterUncloaked,amatosov-rbx,dependabot[bot],afujiwara-roblox"
+      use-remote-repo: true
+      remote-repo-name: "roblox/cla-bot-store"
+    secrets: inherit

.github/workflows/test.yml

@@ -9,19 +9,106 @@ on:
 
 jobs:
   build:
+    name: Test setup-foreman action
     strategy:
       matrix:
         os: ["ubuntu-latest", "windows-latest", "macos-latest"]
 
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16
+
+    - run: npm install
+    - run: npm run all
+    - run: npm run pack
+
+    - name: setup-foreman
+      uses: ./
+      with:
+        version: "*"
+        token: ${{ secrets.GITHUB_TOKEN }}
+        allow-external-github-orgs: true
+    - run: foreman --version
+    - run: rojo --version
+
+  build-in-dir:
+    name: Test setup-foreman action with working-directory
+    strategy:
+      matrix:
+        os: ["ubuntu-latest", "windows-latest", "macos-latest"]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16
     - run: npm install
     - run: npm run all
     - run: npm run pack
-    - uses: ./
+    - name: setup-foreman with working-directory
+      uses: ./
       with:
         version: "*"
         token: ${{ secrets.GITHUB_TOKEN }}
+        working-directory: tests
+        allow-external-github-orgs: true
     - run: foreman --version
-    - run: rojo --version
+    - run: selene --version
+
+  external-org-false-failure:
+    name: Test allow-external-gitub-org false expect failure
+    strategy:
+      matrix:
+        os: ["ubuntu-latest"]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16
+    - run: npm install
+    - run: npm run all
+    - run: npm run pack
+
+    - name: setup-foreman-failure
+      uses: ./
+      id: setup-foreman-failure
+      with:
+        version: "*"
+        token: ${{ secrets.GITHUB_TOKEN }}
+        working-directory: tests
+        allow-external-github-orgs: false
+      continue-on-error: true
+
+    - name: fail on success
+      if: steps.setup-foreman-failure.outcome == 'success'
+      run: exit 1
+
+    - name: succeed on failure
+      run: exit 0
+
+  external-org-false-success:
+    name: Test allow-external-gitub-org false expect success
+    strategy:
+      matrix:
+        os: ["ubuntu-latest"]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v3
+    - uses: actions/setup-node@v3
+      with:
+        node-version: 16
+    - run: npm install
+    - run: npm run all
+    - run: npm run pack
+
+    - name: setup-foreman-success
+      uses: ./
+      with:
+        version: "*"
+        token: ${{ secrets.GITHUB_TOKEN }}
+        working-directory: tests-external-org
+        allow-external-github-orgs: false

README.md

@@ -22,5 +22,32 @@ A SemVer version range of Foreman to install.
 
 If not specified, the latest stable release will be installed.
 
+#### `working-directory` (optional)
+A working directory in which `foreman install` will be executed.
+
+If not specified the root job folder will be used.
+
+#### `allow-external-github-orgs` (optional)
+A boolean value to allow external github orgs in the foreman manifest file.
+
+If not specified, external github orgs will not be allowed.
+
+#### `github-api-url` (optional)
+Override for the GitHub API URL. By default GitHub Actions will supply this
+value as the current environment, which will usually be
+`https://api.github.com`.
+
+This parameter exists primarily to allow GitHub Enterprise to point back to
+GitHub Cloud to install publicly hosted tools.
+
+As such, for any use of this action in GitHub Enterprise, `github-api-url`
+should be included like so:
+```yaml
+- uses: Roblox/setup-foreman@v1
+  with:
+    token: ${{ secrets.GITHUB_TOKEN }}
+    github-api-url: "https://api.github.com"
+```
+
 ## License
-setup-foreman is available under the MIT license. See [LICENSE.txt](LICENSE.txt) or <https://opensource.org/licenses/MIT> for details.
+setup-foreman is available under the MIT license. See [LICENSE.txt](LICENSE.txt) or <https://opensource.org/licenses/MIT> for details.

__tests__/configFile.test.ts

@@ -0,0 +1,79 @@
+import configFile from "../src/configFile";
+import foreman from "../src/foreman";
+import type { GitHubRelease } from "../src/foreman";
+import { parse } from "toml";
+test("get off my back, Jest", () => {
+  expect(5).toEqual(5);
+});
+
+test("checkSameOrgToolSpec same org", () => {
+  let config = `
+    [tools]\n
+    tool1 = { source = "org1/tool1", version = "1.0.0" }\n
+    tool2 = { source = "org1/tool2", version = "1.0.0" }\n
+    tool3 = { source = "org1/tool3", version = "1.0.0" }\n
+  `;
+  let manifestContent = parse(config);
+  expect(configFile.checkSameOrgToolSpecs(manifestContent, "org1")).toEqual(
+    true
+  );
+});
+
+test("checkSameOrgToolSpec different org", () => {
+  let config = `
+    [tools]\n
+    tool1 = { source = "org1/tool1", version = "1.0.0" }\n
+    tool2 = { source = "org2/tool2", version = "1.0.0" }\n
+    tool3 = { source = "org1/tool3", version = "1.0.0" }\n
+  `;
+  let manifestContent = parse(config);
+  expect(configFile.checkSameOrgToolSpecs(manifestContent, "org1")).toEqual(
+    false
+  );
+});
+
+test("filter valid releases", () => {
+  const releases: GitHubRelease[] = [
+    {
+      tag_name: "v1.0.0",
+      assets: []
+    },
+    {
+      tag_name: "v2.1.0",
+      assets: []
+    },
+    {
+      tag_name: "v3.0.0-rc.1",
+      assets: []
+    },
+    {
+      tag_name: "notvalidsemver",
+      assets: []
+    },
+    {
+      tag_name: "4.3.0",
+      assets: []
+    },
+    {
+      tag_name: "verybadtag",
+      assets: []
+    }
+  ];
+
+  const expectedFilteredReleases: GitHubRelease[] = [
+    {
+      tag_name: "v1.0.0",
+      assets: []
+    },
+    {
+      tag_name: "v2.1.0",
+      assets: []
+    },
+    {
+      tag_name: "v3.0.0-rc.1",
+      assets: []
+    }
+  ];
+  const filteredReleases = foreman.filterValidReleases(releases);
+  expect(filteredReleases).toEqual(expectedFilteredReleases);
+});

action.yml

@@ -3,9 +3,26 @@ description: 'Install Foreman, a toolchain manager for Roblox projects'
 author: 'The Rojo Developers'
 inputs:
   version:
+    required: false
     description: 'SemVer version of Foreman to install'
+  working-directory:
+    required: false
+    description: 'Working directory to run `foreman install` in'
+  github-api-url:
+    required: false
+    description: 'GitHub API to make requests to'
   token:
+    required: true
     description: 'GitHub token from secrets.GITHUB_TOKEN'
+  allow-external-github-orgs:
+    required: false
+    description: 'Allow installing from external GitHub organizations'
+  artifactory-url:
+    required: false
+    description: 'Artifactory URL to use for downloading Foreman tools'
+  artifactory-token:
+    required: false
+    description: 'Artifactory token to use for downloading Foreman tools'
 runs:
-  using: 'node12'
+  using: 'node16'
   main: 'dist/index.js'

foreman.toml

@@ -1,4 +1,5 @@
 # This file is used as a way to make sure that setup-foreman is functioning.
 
 [tools]
-rojo = { source = "Roblox/rojo", version = "0.6.0-alpha.1" }
+rojo = { source = "Roblox/rojo", version = "0.6.0-alpha.1" }
+selene = { source = "Kampfkarren/selene", version = "0.15.0" }