diff --git a/.github/workflows/DNS.yml b/.github/workflows/DNS.yml index 038da871..9c034792 100644 --- a/.github/workflows/DNS.yml +++ b/.github/workflows/DNS.yml @@ -19,13 +19,12 @@ jobs: outputs: hasToken: ${{ steps.step_one.outputs.hasToken }} env: - CF_Key : ${{ secrets.CF_Key }} - CF_Email : ${{ secrets.CF_Email }} + ${{ secrets.TokenName1 }} : ${{ secrets.TokenValue1 }} steps: - name: Set the value id: step_one run: | - if [ "$CF_Key" ] ; then + if [ "$${{ secrets.TokenName1 }}" ] ; then echo "::set-output name=hasToken::true" else echo "::set-output name=hasToken::false" @@ -38,8 +37,8 @@ jobs: needs: CheckToken if: "contains(needs.CheckToken.outputs.hasToken, 'true')" env: - CF_Key : ${{ secrets.CF_Key }} - CF_Email : ${{ secrets.CF_Email }} + ${{ secrets.TokenName1 }} : ${{ secrets.TokenValue1 }} + ${{ secrets.TokenName2 }} : ${{ secrets.TokenValue2 }} TEST_DNS : ${{ secrets.TEST_DNS }} TestingDomain: ${{ secrets.TestingDomain }} @@ -53,7 +52,7 @@ jobs: - name: Clone acmetest run: cd .. && git clone https://github.com/acmesh-official/acmetest.git && cp -r acme.sh acmetest/ - name: Set env file - run: cd ../acmetest && echo "CF_Key" >> env.list && echo "CF_Email" >> env.list && echo "TEST_DNS_NO_WILDCARD" >> env.list && echo "TEST_DNS_SLEEP" >> env.list + run: cd ../acmetest && echo "${{ secrets.TokenName1 }}" >> env.list && echo "${{ secrets.TokenName2 }}" >> env.list && echo "TEST_DNS_NO_WILDCARD" >> env.list && echo "TEST_DNS_SLEEP" >> env.list - name: Run acmetest run: cd ../acmetest && ./rundocker.sh _cron @@ -61,8 +60,8 @@ jobs: runs-on: macos-latest needs: Docker env: - CF_Key : ${{ secrets.CF_Key }} - CF_Email : ${{ secrets.CF_Email }} + ${{ secrets.TokenName1 }} : ${{ secrets.TokenValue1 }} + ${{ secrets.TokenName2 }} : ${{ secrets.TokenValue2 }} TEST_DNS : ${{ secrets.TEST_DNS }} TestingDomain: ${{ secrets.TestingDomain }} @@ -84,8 +83,8 @@ jobs: runs-on: windows-latest needs: MacOS env: - CF_Key : ${{ secrets.CF_Key }} - CF_Email : ${{ secrets.CF_Email }} + ${{ secrets.TokenName1 }} : ${{ secrets.TokenValue1 }} + ${{ secrets.TokenName2 }} : ${{ secrets.TokenValue2 }} TEST_DNS : ${{ secrets.TEST_DNS }} TestingDomain: ${{ secrets.TestingDomain }}