Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/src/tarkov-data-mana…
Browse files Browse the repository at this point in the history
…ger/npm-dependencies-1d6b79fe52
  • Loading branch information
Razzmatazzz authored Apr 1, 2024
2 parents 4ca840d + 7b7b3d6 commit efd87b3
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/branch-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,15 @@ jobs:
script_stop: true
script: ~/tarkov-data-manager/script/deploy -r="${{ steps.branch-deploy.outputs.ref }}" -f="${{ steps.branch-deploy.outputs.fork_checkout }}" -d="tarkov-data-manager" -n="${{ steps.branch-deploy.outputs.fork_full_name }}"

- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # [email protected]
if: ${{ steps.branch-deploy.outputs.continue == 'true' && steps.branch-deploy.outputs.noop != 'true' }}
with:
python-version: '3.10'
cache: 'pip'
# - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # [email protected]
# if: ${{ steps.branch-deploy.outputs.continue == 'true' && steps.branch-deploy.outputs.noop != 'true' }}
# with:
# python-version: '3.10'
# cache: 'pip'

- name: health
if: ${{ steps.branch-deploy.outputs.continue == 'true' && steps.branch-deploy.outputs.noop != 'true' }}
working-directory: script/health
run: |
pip install -r requirements.txt
python health.py
# - name: health
# if: ${{ steps.branch-deploy.outputs.continue == 'true' && steps.branch-deploy.outputs.noop != 'true' }}
# working-directory: script/health
# run: |
# pip install -r requirements.txt
# python health.py
20 changes: 10 additions & 10 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ jobs:
script_stop: true
script: ~/tarkov-data-manager/script/deploy -r="main" -d="tarkov-data-manager"

- uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # [email protected]
with:
python-version: '3.10'
cache: 'pip'

- name: health
working-directory: script/health
run: |
pip install -r requirements.txt
python health.py
# - uses: actions/setup-python@0a5c61591373683505ea898e09a3ea4f39ef2b9c # [email protected]
# with:
# python-version: '3.10'
# cache: 'pip'

# - name: health
# working-directory: script/health
# run: |
# pip install -r requirements.txt
# python health.py
4 changes: 2 additions & 2 deletions .github/workflows/restart-vm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ jobs:

steps:
- name: azure login
uses: azure/login@cb79c773a3cfa27f31f25eb3f677781210c9ce3d # pin@v1.6.1
uses: azure/login@8c334a195cbb38e46038007b304988d888bf676a # pin@v2.0.0
with:
creds: ${{ secrets.AZURE_CREDENTIALS }}

- name: restart vm
uses: azure/CLI@4db43908b9df2e7ac93c8275a8f9a448c59338dd # pin@v1.0.9
uses: azure/CLI@965c8d7571d2231a54e321ddd07f7b10317f34d9 # pin@v2.0.0
with:
azcliversion: 2.50.0
inlineScript: |
Expand Down

0 comments on commit efd87b3

Please sign in to comment.