Skip to content

Commit

Permalink
Renamed master to prod (#1054)
Browse files Browse the repository at this point in the history
  • Loading branch information
HunterBarclay authored Jul 27, 2024
2 parents 7b4f7ea + c6980a0 commit 8c423cf
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/BlackFormat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: Fusion - Black Format Validation
on:
workflow_dispatch: {}
push:
branches: [ master, dev ]
branches: [ prod, dev ]
pull_request:
branches: [ master, dev ]
branches: [ prod, dev ]

jobs:
blackFormatChecker:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/FissionBuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Fission - Build
on:
workflow_dispatch: {}
pull_request:
branches: [master, dev]
branches: [ prod, dev ]

jobs:
buildFission:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/FissionESLintFormat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: Fission - ES Lint Format Validation
on:
workflow_dispatch: {}
push:
branches: [ master, dev ]
branches: [ prod, dev ]
pull_request:
branches: [ master, dev ]
branches: [ prod, dev ]

jobs:
runFormatValidationScript:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/FissionPackage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Fission - Package
on:
workflow_dispatch: {}
push:
branches: [ master, dev ]
branches: [ prod, dev ]

jobs:
runUnitTests:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/FissionUnitTest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ name: Fission - Unit Test
on:
workflow_dispatch: {}
push:
branches: [master, dev]
branches: [ prod, dev ]
pull_request:
branches: [master, dev]
branches: [ prod, dev ]

jobs:
runUnitTests:
Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

<br/>

[![Fission - Unit Test](https://github.com/Autodesk/synthesis/actions/workflows/FissionUnitTest.yml/badge.svg?branch=master)](https://github.com/Autodesk/synthesis/actions/workflows/FissionUnitTest.yml)
[![Fission - Packaging](https://github.com/Autodesk/synthesis/actions/workflows/FissionPackage.yml/badge.svg?branch=master)](https://github.com/Autodesk/synthesis/actions/workflows/FissionPackage.yml)
[![Fission - Lint/Format](https://github.com/Autodesk/synthesis/actions/workflows/FissionESLintFormat.yml/badge.svg?branch=master)](https://github.com/Autodesk/synthesis/actions/workflows/FissionESLintFormat.yml)
[![Fusion - Format](https://github.com/Autodesk/synthesis/actions/workflows/BlackFormat.yml/badge.svg?branch=master)](https://github.com/Autodesk/synthesis/actions/workflows/BlackFormat.yml)
[![Fission - Unit Test](https://github.com/Autodesk/synthesis/actions/workflows/FissionUnitTest.yml/badge.svg?branch=prod)](https://github.com/Autodesk/synthesis/actions/workflows/FissionUnitTest.yml)
[![Fission - Packaging](https://github.com/Autodesk/synthesis/actions/workflows/FissionPackage.yml/badge.svg?branch=prod)](https://github.com/Autodesk/synthesis/actions/workflows/FissionPackage.yml)
[![Fission - Lint/Format](https://github.com/Autodesk/synthesis/actions/workflows/FissionESLintFormat.yml/badge.svg?branch=prod)](https://github.com/Autodesk/synthesis/actions/workflows/FissionESLintFormat.yml)
[![Fusion - Format](https://github.com/Autodesk/synthesis/actions/workflows/BlackFormat.yml/badge.svg?branch=prod)](https://github.com/Autodesk/synthesis/actions/workflows/BlackFormat.yml)

Synthesis is a robotics simulator designed by and for [FIRST®](https://www.firstinspires.org/) robotics students to help teams design, strategize, test and practice. Teams have the ability to import their own robots and fields using our [Fusion Exporter](/exporter/) or use the pre-made ones available within Synthesis.

Expand Down
6 changes: 3 additions & 3 deletions installer/Windows/README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# <img src="https://raw.githubusercontent.com/Autodesk/synthesis/master/installer/Windows/orange-install-nsis.ico" alt="logo" width="50" height ="50" align="left"/>Nullsoft Scriptable Install System
# <img src="https://raw.githubusercontent.com/Autodesk/synthesis/prod/installer/Windows/orange-install-nsis.ico" alt="logo" width="50" height ="50" align="left"/>Nullsoft Scriptable Install System

For installation on Windows Operating Systems, we use our own custom written NSIS installer in order to extract all the necessary files to their proper locations on the system.

- [MainInstaller(x64)](https://github.com/Autodesk/synthesis/blob/master/installer/Windows/MainInstaller.nsi) - (Used for the full installation of Synthesis, only compatible on 64 bit operating systems.)
- [EngInstaller(x86)](https://github.com/Autodesk/synthesis/blob/master/installer/Windows/EngInstaller(x86).nsi) - (Used only for installation on 32 bit operating systems and extracts just the Unity Engine.)
- [MainInstaller(x64)](https://github.com/Autodesk/synthesis/blob/prod/installer/Windows/MainInstaller.nsi) - (Used for the full installation of Synthesis, only compatible on 64 bit operating systems.)
- [EngInstaller(x86)](https://github.com/Autodesk/synthesis/blob/prod/installer/Windows/EngInstaller(x86).nsi) - (Used only for installation on 32 bit operating systems and extracts just the Unity Engine.)

### Compiling NSIS:
In order to compile the NSIS configuration properly, you must compile all of the individual components of Synthesis pertaining to the particular script you are trying to compile. Then the compiled components must be stored in the same directory as the NSIS script, in order for them to be packaged during NSIS compilation. For details on this process, feel free to contact [email protected]
Expand Down
2 changes: 1 addition & 1 deletion tutorials/FusionExporter.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ feedback link: https://github.com/Autodesk/synthesis/issues

The Synthesis Fusion 360 exporter is the tool used by both developers and users to export their CAD models into the Synthesis simulator. The exporter comes as an optional install component of every version of synthesis and requires Fusion 360 to be installed.

For information regarding the manual install process visit the [Synthesis Fusion 360 Exporter](https://github.com/Autodesk/synthesis/tree/master/exporter) source code for more information.
For information regarding the manual install process visit the [Synthesis Fusion 360 Exporter](https://github.com/Autodesk/synthesis/tree/prod/exporter) source code for more information.

### Getting Started

Expand Down

0 comments on commit 8c423cf

Please sign in to comment.