File tree Expand file tree Collapse file tree 2 files changed +7
-6
lines changed
actions/configure-goproxy Expand file tree Collapse file tree 2 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -17,14 +17,14 @@ runs:
1717 id : configure-goproxy
1818 shell : bash
1919 run : |
20- if [[ "${{ secrets.ARTIFACTORY_USER }}" == "" ]] ||
20+ if [[ "${{ inputs.user }}" == "" ]] ||
2121 [[ ${{ github.event.pull_request.head.repo.fork }} ]] ||
2222 [[ ${{ startsWith(github.head_ref, 'dependabot-')}} ]] ; then
2323 echo "No Artifactory secrets available - using direct GOPROXY"
2424 GOPROXY_VALUE="direct"
2525 else
2626 echo "Development mode - using dev Artifactory"
27- GOPROXY_VALUE="https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_URL }}"
27+ GOPROXY_VALUE="https://${{ inputs.user }}:${{ inputs.token }}@${{ secrets.ARTIFACTORY_URL }}"
2828 fi
2929 echo "GOPROXY=${GOPROXY_VALUE}" >> $GITHUB_ENV
3030
Original file line number Diff line number Diff line change @@ -20,15 +20,15 @@ permissions:
2020
2121env :
2222 NFPM_VERSION : ' v2.35.3'
23- GOPROXY : " https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@azr.artifactory.f5net.com/artifactory/api/go/f5-nginx-go-dev "
23+ GOPROXY : " direct "
2424
2525jobs :
2626 proxy-sanity-check :
2727 name : Proxy Sanity Check
2828 runs-on : ubuntu-22.04
2929 if : ${{ !github.event.pull_request.head.repo.fork && !startsWith(github.head_ref, 'dependabot-') }}
3030 env :
31- GOPROXY : " https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@azr.artifactory.f5net.com/artifactory/api/go/f5-nginx-go-dev "
31+ GOPROXY : " https://${{ secrets.ARTIFACTORY_USER }}:${{ secrets.ARTIFACTORY_TOKEN }}@${{ secrets.ARTIFACTORY_URL_DEV }} "
3232 steps :
3333 - uses : actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
3434 with :
5050 with :
5151 user : ${{ secrets.ARTIFACTORY_USER }}
5252 token : ${{ secrets.ARTIFACTORY_TOKEN }}
53+ url : ${{ secrets.ARTIFACTORY_URL_DEV }}
5354 - uses : actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
5455 with :
5556 go-version-file : ' go.mod'
@@ -67,11 +68,11 @@ jobs:
6768 steps :
6869 - uses : actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
6970
70- - name : Configure GOPROXY
71- uses : ./.github/actions/configure-goproxy
71+ - uses : ./.github/actions/configure-goproxy
7272 with :
7373 user : ${{ secrets.ARTIFACTORY_USER }}
7474 token : ${{ secrets.ARTIFACTORY_TOKEN }}
75+ url : ${{ secrets.ARTIFACTORY_URL_DEV }}
7576
7677 - uses : actions/setup-go@44694675825211faa026b3c33043df3e48a5fa00 # v6.0.0
7778 with :
You can’t perform that action at this time.
0 commit comments