chore: rebase to master

This commit is contained in:
Chris Hawk 2023-11-20 10:44:17 -08:00
commit 50ed9f42b5
6 changed files with 42 additions and 42 deletions

View file

@ -26,13 +26,13 @@ jobs:
- stable-2.15 - stable-2.15
steps: steps:
- name: check out code - name: check out code
uses: actions/checkout@v2 uses: actions/checkout@v4
with: with:
path: ansible_collections/google/cloud path: ansible_collections/google/cloud
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v1 uses: actions/setup-python@v4
with: with:
python-version: "3.9" # this is the minimum version required for Ansible 2.13 python-version: '3.9' # this is the minimum version required for Ansible 2.15
- name: Install dependencies - name: Install dependencies
run: pip install -r requirements.txt run: pip install -r requirements.txt
- name: Install ansible-base (${{ matrix.ansible_version }}) - name: Install ansible-base (${{ matrix.ansible_version }})

View file

@ -2,7 +2,7 @@
name: Run tests for the cloud.google collection name: Run tests for the cloud.google collection
on: [pull_request] on: [pull_request]
env: env:
PYTHON_VERSION: "3.9" # minimum version for Ansible 2.14 PYTHON_VERSION: "3.9" # minimum version for Ansible 2.15
jobs: jobs:
sanity-and-lint: sanity-and-lint:
runs-on: ubuntu-latest runs-on: ubuntu-latest
@ -16,11 +16,11 @@ jobs:
- stable-2.15 - stable-2.15
steps: steps:
- name: check out code - name: check out code
uses: actions/checkout@v2 uses: actions/checkout@v4
with: with:
path: ansible_collections/google/cloud path: ansible_collections/google/cloud
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v1 uses: actions/setup-python@v4
with: with:
python-version: ${{ env.PYTHON_VERSION }} python-version: ${{ env.PYTHON_VERSION }}
# Automation-hub requires python2.7 sanity tests # Automation-hub requires python2.7 sanity tests
@ -53,11 +53,11 @@ jobs:
- stable-2.15 - stable-2.15
steps: steps:
- name: check out code - name: check out code
uses: actions/checkout@v2 uses: actions/checkout@v4
with: with:
path: ansible_collections/google/cloud path: ansible_collections/google/cloud
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v1 uses: actions/setup-python@v4
with: with:
python-version: ${{ env.PYTHON_VERSION }} python-version: ${{ env.PYTHON_VERSION }}
- name: Install dependencies - name: Install dependencies

View file

@ -8,18 +8,18 @@ jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v1 uses: actions/setup-python@v4
with: with:
python-version: 3.x python-version: '3.x'
- name: Install dependencies - name: Install dependencies
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install ansible pip install ansible
- name: Build and publish - name: Build and publish
env: env:
ANSIBLE_AUTOMATION_HUB_API_KEY: ${{ secrets.ANSIBLE_AUTOMATION_HUB_API_KEY }} ANSIBLE_AUTOMATION_HUB_API_KEY: ${{ secrets.ANSIBLE_AUTOMATION_HUB_API_KEY }}
run: | run: |
ansible-galaxy collection build . ansible-galaxy collection build .
ansible-galaxy collection publish *.tar.gz --api-key=$ANSIBLE_AUTOMATION_HUB_API_KEY -s=https://cloud.redhat.com/api/automation-hub/ ansible-galaxy collection publish *.tar.gz --api-key=$ANSIBLE_AUTOMATION_HUB_API_KEY -s=https://cloud.redhat.com/api/automation-hub/

View file

@ -27,12 +27,12 @@ jobs:
- gcloud - gcloud
steps: steps:
- name: Check out code - name: Check out code
uses: actions/checkout@v1 uses: actions/checkout@v4
with: with:
path: ansible_collections/google/cloud path: ansible_collections/google/cloud
- name: Set up Python 3.9 - name: Set up Python 3.9
uses: actions/setup-python@v1 uses: actions/setup-python@v4
with: with:
python-version: 3.9 python-version: 3.9

View file

@ -22,12 +22,12 @@ jobs:
- gcsfuse - gcsfuse
steps: steps:
- name: Check out code - name: Check out code
uses: actions/checkout@v1 uses: actions/checkout@v4
with: with:
path: ansible_collections/google/cloud path: ansible_collections/google/cloud
- name: Set up Python 3.9 - name: Set up Python 3.9
uses: actions/setup-python@v1 uses: actions/setup-python@v4
with: with:
python-version: 3.9 python-version: 3.9

View file

@ -8,18 +8,18 @@ jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v4
- name: Set up Python - name: Set up Python
uses: actions/setup-python@v1 uses: actions/setup-python@v4
with: with:
python-version: 3.x python-version: '3.x'
- name: Install dependencies - name: Install dependencies
run: | run: |
python -m pip install --upgrade pip python -m pip install --upgrade pip
pip install ansible pip install ansible
- name: Build and publish - name: Build and publish
env: env:
ANSIBLE_GALAXY_API_KEY: ${{ secrets.ANSIBLE_GALAXY_API_KEY }} ANSIBLE_GALAXY_API_KEY: ${{ secrets.ANSIBLE_GALAXY_API_KEY }}
run: | run: |
ansible-galaxy collection build . ansible-galaxy collection build .
ansible-galaxy collection publish *.tar.gz --api-key $ANSIBLE_GALAXY_API_KEY ansible-galaxy collection publish *.tar.gz --api-key $ANSIBLE_GALAXY_API_KEY