diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4e078e8..595a0e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -35,7 +35,7 @@ jobs: ## Read the json file into the environment variables - name: JSON to variables - uses: rgarcia-phi/json-to-variables@v1.1.0 + uses: actions/checkout@v2 with: filename: 'package.json' prefix: project @@ -178,5 +178,5 @@ jobs: run: | source bin/config.sh ${{ env.THE_ENV }} - # terraform plan -var-file=tfvars/"${{ env.THE_ENV }}".tfvars -var="app_version=${{ env.THE_VERSION }}" -out="tfplan" - # terraform apply -auto-approve tfplan \ No newline at end of file + terraform plan -var-file=tfvars/"${{ env.THE_ENV }}".tfvars -var="app_version=${{ env.THE_VERSION }}" -out="tfplan" + terraform apply -auto-approve tfplan \ No newline at end of file diff --git a/.github/workflows/release_created.yml b/.github/workflows/release_created.yml deleted file mode 100644 index db1828f..0000000 --- a/.github/workflows/release_created.yml +++ /dev/null @@ -1,30 +0,0 @@ - -name: Release Branch Created - -# Run whenever a ref is created https://docs.github.com/en/actions/reference/events-that-trigger-workflows#create -on: - create - -jobs: - # First job in the workflow builds and verifies the software artifacts - bump: - name: Bump minor version on develop - # The type of runner that the job will run on - runs-on: ubuntu-latest - # Only run if ref created was a release branch - if: - ${{ startsWith(github.ref, 'refs/heads/release/') }} - steps: - - # Checks-out the develop branch - - uses: actions/checkout@v2 - with: - ref: 'refs/heads/develop' - - name: Bump minor version - run: | - npm version prepatch -m '/version %s' - - name: Commit Version Bump - run: | - git config --global user.name 'hydrocron-api bot' - git config --global user.email 'hydrocron-api@noreply.github.com' - git push \ No newline at end of file diff --git a/terraform/api-specification-templates/fts_aws_api.yml b/terraform/api-specification-templates/hydrocron_aws_api.yml similarity index 100% rename from terraform/api-specification-templates/fts_aws_api.yml rename to terraform/api-specification-templates/hydrocron_aws_api.yml