Skip to content

Commit

Permalink
Merge pull request #108 from KelvinTegelaar/dev
Browse files Browse the repository at this point in the history
[pull] dev from KelvinTegelaar:dev
  • Loading branch information
pull[bot] authored Feb 14, 2025
2 parents aa988a7 + 118129d commit 1e22c96
Show file tree
Hide file tree
Showing 2 changed files with 53 additions and 2 deletions.
52 changes: 52 additions & 0 deletions .github/workflows/cipp_dev_build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: CIPP Frontend Build

on:
push:
branches:
- dev
workflow_dispatch:

permissions:
contents: write

jobs:
build:
if: github.event.repository.fork == false
name: Build and Upload CIPP Frontend
runs-on: ubuntu-latest

steps:
# Checkout the repository
- name: Checkout Code
uses: actions/checkout@v3

# Set up Node.js
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: '20.18.1'

# Install dependencies
- name: Install Dependencies
run: yarn install

# Build the project
- name: Build Project
run: npm run build

# Create ZIP File in a New Source Directory
- name: Prepare and Zip Build Files
run: |
mkdir -p build
cp staticwebapp.config.json out/
zip -r build/dev.zip out
# Upload to Azure Blob Storage
- name: Azure Blob Upload
uses: LanceMcCarthy/Action-AzureBlobUpload@v3.3.0
with:
connection_string: ${{ secrets.AZURE_CONNECTION_STRING }}
container_name: cipp
source_folder: build/
destination_folder: /
delete_if_exists: true
3 changes: 1 addition & 2 deletions src/components/CippWizard/CIPPDeploymentStep.js
Original file line number Diff line number Diff line change
Expand Up @@ -341,8 +341,7 @@ export const CippDeploymentStep = (props) => {
placeholder="Enter the application secret. Leave blank to retain previous key."
validators={{
validate: (value) => {
const secretRegex =
/^(?![0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)[0-9a-zA-Z]{40}$/;
const secretRegex = /^(?!^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)[A-Za-z0-9-_~.]{20,}$/;
return (
value === "" ||
secretRegex.test(value) ||
Expand Down

0 comments on commit 1e22c96

Please sign in to comment.