Skip to content

Commit

Permalink
fix: added tsx language redirector
Browse files Browse the repository at this point in the history
  • Loading branch information
Filipe Forattini committed Aug 10, 2022
1 parent f118dfc commit f11cf90
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/actions/config-scrapper/index.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .github/actions/config-scrapper/index.js.map

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions .github/actions/k8s-install-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: 'Install k8s dependencies'
description: 'Install k8s dependencies'

inputs:
token:
description: 'github token'
required: true
kubeConfig:
description: 'kubeconfig file as base64'
required: true
Expand Down Expand Up @@ -39,6 +42,7 @@ runs:
- name: Setup | Cloning tools
uses: actions/checkout@v3
with:
token: ${{inputs.token}}
ref: main
path: .pipeline
repository: filipeforattini/ff-iac-github-actions
Expand Down
9 changes: 9 additions & 0 deletions .github/workflows/app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ jobs:
#--------------------------------------------------#
Release:
runs-on: ubuntu-latest

if: needs.Setup.outputs.Event == 'push'

needs:
Expand Down Expand Up @@ -160,6 +161,7 @@ jobs:
#--------------------------------------------------#
Trigger-Build:
runs-on: ubuntu-latest

if: github.event_name == 'push'

needs:
Expand All @@ -176,6 +178,8 @@ jobs:
- name: Pipeline config scrapper
id: analysis
uses: filipeforattini/ff-iac-github-actions/.github/actions/config-scrapper@main
with:
containerRegistry: ${{inputs.containerRegistry}}

- name: Trigger
run: |
Expand Down Expand Up @@ -254,6 +258,8 @@ jobs:
- name: Pipeline config scrapper
id: analysis
uses: filipeforattini/ff-iac-github-actions/.github/actions/config-scrapper@main
with:
containerRegistry: ${{inputs.containerRegistry}}

- name: Setup | Dependencies
uses: filipeforattini/ff-iac-github-actions/.github/actions/setup-binaries@main
Expand Down Expand Up @@ -306,6 +312,7 @@ jobs:
#--------------------------------------------------#
Deploy:
runs-on: ubuntu-latest

environment: ${{needs.Setup.outputs.Environment}}

needs:
Expand Down Expand Up @@ -341,6 +348,8 @@ jobs:
- name: Pipeline config scrapper
id: analysis
uses: filipeforattini/ff-iac-github-actions/.github/actions/config-scrapper@main
with:
containerRegistry: ${{inputs.containerRegistry}}

- name: Config | Version
id: versioning
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/svc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ name: svc
concurrency:
group: ${{github.workflow}}-${{github.event_name}}


#--------------------------------------------------#
# Triggers #
#--------------------------------------------------#
on:

workflow_call:

inputs:
mainBranch:
type: string
Expand Down Expand Up @@ -321,7 +321,6 @@ jobs:
Trigger-Build-Node:
runs-on: ubuntu-latest
if: github.event_name == 'push'

needs:
- Release-Node

Expand Down Expand Up @@ -362,7 +361,6 @@ jobs:
Trigger-Build-Python:
runs-on: ubuntu-latest
if: github.event_name == 'push'

needs:
- Release-Python

Expand Down Expand Up @@ -446,7 +444,6 @@ jobs:
if: |
github.event_name == 'deployment'
&& needs.Setup.outputs.Language == 'javascript'
needs:
- Setup

Expand Down Expand Up @@ -647,14 +644,15 @@ jobs:
- name: Create k8s dependencies
uses: filipeforattini/ff-iac-github-actions/.github/actions/k8s-install-dependencies@main
with:
token: ${{secrets.GITHUB_TOKEN}}
cloneTools: false
writeSummary: true
kubeConfig: ${{secrets.KUBE_CONFIG}}
version: ${{steps.versioning.outputs.version}}
repository: ${{steps.analysis.outputs.repository}}
namespace: ${{steps.analysis.outputs.deploy_namespace}}

# configs\
# configs
- name: K8s create config-map
if: steps.analysis.outputs.feature_has_configs
run: |
Expand Down Expand Up @@ -744,7 +742,9 @@ jobs:
#--------------------------------------------------#
Deploy-Python:
runs-on: ubuntu-latest

environment: ${{needs.Setup.outputs.Environment}}

if: needs.Setup.outputs.Language == 'python'

needs:
Expand Down
1 change: 1 addition & 0 deletions src/actions/config-scrapper/src/code.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ const { templateInfo } = require("../log");
const LanguagesToOmit = ["Makefile"];
const languagesRouter = {
typescript: "javascript",
tsx: "javascript",
};

module.exports = async (analysis) => {
Expand Down
4 changes: 4 additions & 0 deletions src/actions/k8s-install-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ name: 'Install k8s dependencies'
description: 'Install k8s dependencies'

inputs:
token:
description: 'github token'
required: true
kubeConfig:
description: 'kubeconfig file as base64'
required: true
Expand Down Expand Up @@ -39,6 +42,7 @@ runs:
- name: Setup | Cloning tools
uses: actions/checkout@v3
with:
token: ${{inputs.token}}
ref: main
path: .pipeline
repository: filipeforattini/ff-iac-github-actions
Expand Down

0 comments on commit f11cf90

Please sign in to comment.