diff --git a/.github/workflows/react.yml.old.txt b/.github/workflows/react.yml similarity index 58% rename from .github/workflows/react.yml.old.txt rename to .github/workflows/react.yml index da30dd4..c6a6289 100644 --- a/.github/workflows/react.yml.old.txt +++ b/.github/workflows/react.yml @@ -1,6 +1,3 @@ -# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs - name: Ensure React Project Builds on: @@ -8,32 +5,44 @@ on: branches: ["dev", "main"] pull_request: branches: ["dev", "main"] + env: DOTNET_CORE_VERSION: 8.0.x WORKING_DIRECTORY: ./src/EducationTrail/ClientApp + jobs: build: runs-on: ubuntu-latest strategy: matrix: - # omits 14.x because some of our devDependencies require 16.x or higher node-version: [18.x, 20.x] - # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: - - uses: actions/checkout@v4 + - name: Checkout Repository + uses: actions/checkout@v4 + - name: Setup .NET uses: actions/setup-dotnet@v3 with: dotnet-version: ${{ env.DOTNET_CORE_VERSION }} + - name: Use Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 with: node-version: ${{ matrix.node-version }} cache: "npm" + - name: Generate and Install ASP.NET Cert run: | - dotnet dev-certs https --clean - dotnet dev-certs https --export-path ~/.aspnet/https --format Pem --no-password + dotnet dev-certs https --clean + dotnet dev-certs https --export-path ~/.aspnet/https --format Pem --no-password + + - name: Rename Certificate and Key Files + run: | + mkdir -p ./.aspnet/https + mv ./.aspnet/https/localhost.crt ./.aspnet/https/react-ts.pem || true + mv ./.aspnet/https/localhost.key ./.aspnet/https/react-ts.key || true + working-directory: ${{ github.workspace }} + - name: Test vite+react Project run: | npm ci --prefix "${{ env.WORKING_DIRECTORY }}" diff --git a/src/EducationTrail/ClientApp/aspnetcore-https.js b/src/EducationTrail/ClientApp/aspnetcore-https.js index 9e58786..bd7e5d3 100644 --- a/src/EducationTrail/ClientApp/aspnetcore-https.js +++ b/src/EducationTrail/ClientApp/aspnetcore-https.js @@ -20,6 +20,12 @@ if (!certificateName) { const certFilePath = path.join(baseFolder, `${certificateName}.pem`); const keyFilePath = path.join(baseFolder, `${certificateName}.key`); +console.log(baseFolder); +console.log(certificateArg); +console.log(certificateName); +console.log(certFilePath); +console.log(keyFilePath); + if (!fs.existsSync(certFilePath) || !fs.existsSync(keyFilePath)) { spawn('dotnet', [ 'dev-certs', @@ -33,6 +39,9 @@ if (!fs.existsSync(certFilePath) || !fs.existsSync(keyFilePath)) { .on('exit', (code) => process.exit(code)); } +console.log(certFilePath); +console.log(keyFilePath); + module.exports = { certFilePath, keyFilePath