Skip to content
This repository was archived by the owner on Apr 18, 2024. It is now read-only.

Commit e2a1722

Browse files
authored
Merge pull request #136 from jim-deriv/jim/feq-2076/resolve-security-issues
[FEQ] Jim/FEQ-2076/resolve security issues
2 parents c6b3d8c + 8426762 commit e2a1722

File tree

5 files changed

+22
-47
lines changed

5 files changed

+22
-47
lines changed

.github/actions/invalidate_master_cache/action.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ runs:
44
using: composite
55
steps:
66
- name: save_cache
7-
uses: actions/cache/save@v3
7+
uses: actions/cache/save@13aacd865c20de90d75de3b17ebe84f7a17d57d2
88
with:
99
path: ./node_modules
1010
key: ${{ runner.os }}-node_modules-${{ hashFiles('./package-lock.json') }}

.github/actions/notify_slack/action.yml

-37
This file was deleted.

.github/actions/tag/action.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ runs:
1212

1313
steps:
1414
- name: Set Version
15+
env:
16+
RELEASE_TYPE: ${{ inputs.RELEASE_TYPE }}
1517
id: set_version
1618
run: |
1719
current_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ")
18-
version="${{ inputs.RELEASE_TYPE }}-GH_Run#:${{ github.run_number }}-Date:$current_date"
20+
version="${RELEASE_TYPE}-GH_Run#:${{ github.run_number }}-Date:$current_date"
1921
echo "Setting version to: $version"
2022
echo "version=$version" >> $GITHUB_ENV
2123
shell: bash

.github/workflows/release_production.yml

+17-7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ on:
33
push:
44
tags:
55
- production_*
6+
env:
7+
RELEASE_TYPE: Production
68
jobs:
79
build_test_and_publish:
810
name: Build, Test and Publish to Cloudflare Pages Production
@@ -11,7 +13,7 @@ jobs:
1113
RELEASE_VERSION: ${{ steps.extract_version.outputs.RELEASE_VERSION }}
1214
steps:
1315
- name: Checkout
14-
uses: actions/checkout@v4
16+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
1517
- name: Install npm packages
1618
uses: "./.github/actions/npm_install_from_cache"
1719
- name: Build
@@ -38,11 +40,19 @@ jobs:
3840
needs: [build_test_and_publish]
3941
steps:
4042
- name: Checkout
41-
uses: actions/checkout@v4
43+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
44+
- name: Conclusion
45+
uses: technote-space/workflow-conclusion-action@45ce8e0eb155657ab8ccf346ade734257fd196a5
46+
- name: Create Slack Message
47+
id: create_slack_message
48+
run: |
49+
if [ $WORKFLOW_CONCLUSION == "success" ]; then
50+
echo "MESSAGE=$RELEASE_TYPE Release succeeded for Sindabad with version ${{ needs.build_test_and_publish.outputs.RELEASE_VERSION }}" >> $GITHUB_OUTPUT
51+
else
52+
echo "MESSAGE=$RELEASE_TYPE Release failed for Sindabad with version ${{ needs.build_test_and_publish.outputs.RELEASE_VERSION }}" >> $GITHUB_OUTPUT
53+
fi
4254
- name: Send Slack Notification
43-
uses: "./.github/actions/send_slack_notifications"
55+
uses: "deriv-com/shared-actions/.github/actions/send_slack_notification@master"
4456
with:
45-
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
46-
status: ${{ env.WORKFLOW_CONCLUSION }}
47-
release_type: Production
48-
version: ${{ needs.build_test_and_publish.outputs.RELEASE_VERSION}}
57+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
58+
MESSAGE: ${{ steps.create_slack_message.outputs.MESSAGE }}

.github/workflows/release_staging.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: Checkout
13-
uses: actions/checkout@v4
13+
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
1414
- name: Tag
1515
uses: "./.github/actions/tag"
1616
- name: Install npm packages

0 commit comments

Comments
 (0)