Skip to content

Commit fe1ffcf

Browse files
committed
Changed environment variables for CI
1 parent 79febeb commit fe1ffcf

File tree

1 file changed

+42
-32
lines changed

1 file changed

+42
-32
lines changed

.github/workflows/ci.yml

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,35 @@ jobs:
1313
bundle-app:
1414
name: Bundle App
1515
runs-on: ubuntu-latest
16+
outputs:
17+
app_name: ${{ steps.appenv.outputs.app_name }}
18+
app_id: ${{ steps.appenv.outputs.app_id }}
1619
steps:
1720
- name: Checkout code
1821
uses: actions/checkout@v2
1922

2023
- name: Set app environment variables
24+
id: appenv
2125
run: |
2226
APP_ID=$(cat app.manifest | jq '.info.id.name')
23-
echo APP_ID=$APP_ID | sed -r 's/"//g' >> $GITHUB_ENV
27+
echo "::set-output name=app_id::${APP_ID}"
2428
APP_NAME=$(echo "$APP_ID" | tr _ - )
25-
echo APP_NAME=$APP_NAME | sed -r 's/"//g' >> $GITHUB_ENV
29+
echo "::set-output name=app_name::${APP_NAME}"
30+
# run: |
31+
# APP_ID=$(cat app.manifest | jq '.info.id.name')
32+
# echo APP_ID=$APP_ID | sed -r 's/"//g' >> $GITHUB_ENV
33+
# APP_NAME=$(echo "$APP_ID" | tr _ - )
34+
# echo APP_NAME=$APP_NAME | sed -r 's/"//g' >> $GITHUB_ENV
2635

2736
- name: Excluding images from README
2837
run: |
2938
sed -i '/^!/d' README.md
3039
3140
- name: Bundle app source
3241
run: |
33-
echo ${{ env.APP_NAME }}
42+
echo ${{ steps.appenv.outputs.app_name }}
3443
mkdir dist
35-
tar -zcvf dist/${{ env.APP_NAME }}.tgz --exclude='.[^/]*' --exclude=./dist .
44+
tar -zcvf dist/${{ steps.appenv.outputs.app_name }}.tgz --exclude='.[^/]*' --exclude=./dist .
3645
3746
- name: Upload artifact
3847
uses: actions/upload-artifact@v2
@@ -62,11 +71,11 @@ jobs:
6271
6372
- name: Unpackage artifact
6473
run: |
65-
mkdir ${{ env.APP_ID }}
66-
tar -xf ${{ env.APP_NAME }}.tgz -C ${{ env.APP_ID }}
74+
mkdir ${{ needs.bundle-app.appenv.outputs.app_id }}
75+
tar -xf ${{ needs.bundle-app.appenv.outputs.app_name }}.tgz -C ${{ needs.bundle-app.appenv.outputs.app_id }}
6776
6877
- name: Slim Validate
69-
run: slim validate ${{ env.APP_ID }}
78+
run: slim validate ${{ needs.bundle-app.appenv.outputs.app_id }}
7079

7180
appinspect-cli:
7281
name: AppInspect CLI Validation
@@ -80,8 +89,8 @@ jobs:
8089

8190
- name: Unpackage artifact
8291
run: |
83-
mkdir -p build/${{ env.APP_ID }}
84-
tar -xf ${{ env.APP_NAME }}.tgz -C build/${{ env.APP_ID }}
92+
mkdir -p build/${{ needs.bundle-app.appenv.outputs.app_id }}
93+
tar -xf ${{ needs.bundle-app.appenv.outputs.app_name }}.tgz -C build/${{ needs.bundle-app.appenv.outputs.app_id }}
8594
8695
- name: Setup Python
8796
uses: actions/setup-python@v2
@@ -94,30 +103,31 @@ jobs:
94103
95104
- name: Run AppInspect
96105
run: |
97-
splunk-appinspect inspect ${{ env.APP_ID }} --output-file appinspect.json
106+
splunk-appinspect inspect ${{ needs.bundle-app.appenv.outputs.app_id }} --output-file appinspect.json
98107
exit `cat appinspect.json | jq '.summary.failure'`
99108
working-directory: ./build
100109

101-
# appinspect-api:
102-
# name: AppInspect API Validation
103-
# needs:
104-
# - appinspect-cli
105-
# - slim-validate
106-
# runs-on: ubuntu-latest
107-
# # Job not executed if branch is not master
108-
# if: github.ref == 'refs/heads/master'
109-
# steps:
110-
# - name: Download artifact
111-
# uses: actions/download-artifact@v2
112-
# with:
113-
# name: app_tgz
110+
appinspect-api:
111+
name: AppInspect API Validation
112+
needs:
113+
- bundle-app
114+
- appinspect-cli
115+
- slim-validate
116+
runs-on: ubuntu-latest
117+
# Job not executed if branch is not master
118+
if: github.ref == 'refs/heads/master'
119+
steps:
120+
- name: Download artifact
121+
uses: actions/download-artifact@v2
122+
with:
123+
name: app_tgz
114124

115-
# - name: Run AppInspect
116-
# uses: splunk/appinspect-api-action@v2
117-
# with:
118-
# filePath: ${{ env.APP_NAME }}.tgz
119-
# splunkUser: ${{ secrets.SPLUNK_USER }}
120-
# splunkPassword: ${{ secrets.SPLUNK_PASS }}
121-
# includedTags: cloud
122-
# failOnError: true
123-
# failOnWarning: false
125+
- name: Run AppInspect
126+
uses: splunk/appinspect-api-action@v2
127+
with:
128+
filePath: ${{ needs.bundle-app.appenv.outputs.app_name }}.tgz
129+
splunkUser: ${{ secrets.SPLUNK_USER }}
130+
splunkPassword: ${{ secrets.SPLUNK_PASS }}
131+
includedTags: cloud
132+
failOnError: true
133+
failOnWarning: false

0 commit comments

Comments
 (0)