From fed69dfb1fcc0a4d0d6882081211dffaa1cb1bdc Mon Sep 17 00:00:00 2001 From: Cam <21029087+csqrl@users.noreply.github.com> Date: Mon, 17 May 2021 20:15:51 +0100 Subject: [PATCH] Use rojo stable [release] --- .github/workflows/ci.yml | 14 +++++++------- .vscode/settings.json | 2 +- foreman.toml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 25b56b2..d0df969 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,10 +23,10 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} - name: build test project - run: rojo build test.project.json -o scripts/testplace.rbxlx + run: rojo build ./test.project.json -o ./scripts/testplace.rbxlx - name: run unit tests - run: run-in-roblox --place scripts/testplace.rbxlx --script scripts/run-tests.server.lua + run: run-in-roblox --place ./scripts/testplace.rbxlx --script ./scripts/run-tests.server.lua deploy: runs-on: ubuntu-latest @@ -61,11 +61,11 @@ jobs: - name: build project run: | - rojo build default.project.json -o dist/${{ env.PROJECT_NAME }}.rbxmx - rojo build default.project.json -o dist/${{ env.PROJECT_NAME }}.rbxm + rojo build ./default.project.json -o ./dist/${{ env.PROJECT_NAME }}.rbxmx + rojo build ./default.project.json -o ./dist/${{ env.PROJECT_NAME }}.rbxm - name: upload to roblox - run: rojo upload default.project.json --asset_id 5023525481 --cookie ${{ secrets.ROBLOSECURITY }} + run: rojo upload ./default.project.json --asset_id 5023525481 --cookie ${{ secrets.ROBLOSECURITY }} - name: upload to github releases uses: softprops/action-gh-release@v1 @@ -74,8 +74,8 @@ jobs: body: ${{ env.PROJECT_COMMIT_ID }} tag_name: ${{ env.PROJECT_VERSION }} files: | - dist/${{ env.PROJECT_NAME }}.rbxmx - dist/${{ env.PROJECT_NAME }}.rbxm + ./dist/${{ env.PROJECT_NAME }}.rbxmx + ./dist/${{ env.PROJECT_NAME }}.rbxm draft: true env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.vscode/settings.json b/.vscode/settings.json index 042e254..a7aea66 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,5 +1,5 @@ { - "rojo.releaseBranch": "7.x", + "rojo.releaseBranch": "6.x", "todo-tree.filtering.ignoreGitSubmodules": true, "todo-tree.highlights.useColourScheme": true, diff --git a/foreman.toml b/foreman.toml index 99ae4a8..89557c9 100644 --- a/foreman.toml +++ b/foreman.toml @@ -1,3 +1,3 @@ [tools] -rojo = { source = "rojo-rbx/rojo", version = "^7.0" } +rojo = { source = "rojo-rbx/rojo", version = "^6.1" } run-in-roblox = { source = "rojo-rbx/run-in-roblox", version = "^0.3" }