From ecbf5e59ca6ea2dd8442ec3e383bb37bb4fb2ccd Mon Sep 17 00:00:00 2001 From: Eirik Wulff Date: Wed, 17 Jul 2024 14:06:42 +0200 Subject: [PATCH] =?UTF-8?q?Endret=20navn=20p=C3=A5=20variabel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/utsending.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/utsending.yml b/.github/workflows/utsending.yml index cb9a197..cb15c00 100644 --- a/.github/workflows/utsending.yml +++ b/.github/workflows/utsending.yml @@ -21,9 +21,6 @@ jobs: AZURE_SP_ID=${{vars.AZURE_SP_ID}} AZURE_TENANT_ID=${{ vars.AZURE_TENANT_ID }} MICROSOFT_GRAPH_CLIENT_ID=${{ vars.MICROSOFT_GRAPH_CLIENT_ID }} - MAIL_FROM_ADDRESS=${{ vars.MAIL_FROM_ADDRESS }} - MAIL_FROM_NAME='${{ vars.MAIL_FROM_NAME }}' - MAIL_REPLYTO_ADDRESS=${{ vars.MAIL_REPLYTO_ADDRESS }} PURESERVICE_URL=${{ vars.PURESERVICE_URL }} @@ -32,15 +29,9 @@ jobs: MAIL_MAILER=${{ vars.MAILER }} MAIL_HOST=${{ vars.MAIL_HOST }} - MAIL_USER=${{ vars.MAIL_USER }} + MAIL_USERNAME=${{ vars.MAIL_USER }} APP_DEBUG=${{ vars.APP_DEBUG }} - - PURESERVICE_APIKEY=${{ secrets.PURESERVICE_APIKEY }} - MICROSOFT_GRAPH_CLIENT_SECRET=${{ secrets.MICROSOFT_GRAPH_CLIENT_SECRET }} - REDIS_PASSWORD=${{ secrets.REDIS_SECRET }} - MAIL_PASSWORD=${{ secrets.MAIL_PASSWORD }} - EF_IP_PASSWORD=${{ secrets.INTEGRASJONSPUNKT_PASSWORD }} EOF - name: Cache dependencies id: vendor-cache @@ -57,6 +48,12 @@ jobs: - name: Install dependencies run: composer install - name: Run Jamf2Pureservice + env: + PURESERVICE_APIKEY: ${{ secrets.PURESERVICE_APIKEY }} + MICROSOFT_GRAPH_CLIENT_SECRET: ${{ secrets.MICROSOFT_GRAPH_CLIENT_SECRET }} + REDIS_PASSWORD: ${{ secrets.REDIS_SECRET }} + MAIL_PASSWORD: ${{ secrets.MAIL_PASSWORD }} + EF_IP_PASSWORD: ${{ secrets.INTEGRASJONSPUNKT_PASSWORD }} run: | ./artisan migrate:fresh --force ./artisan pureservice:utsending