Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump pat-s/always-upload-cache from 2.1.5 to 3.0.11 #31

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Bump pat-s/always-upload-cache from 2.1.5 to 3.0.11 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6806c1c
Fix deprecation warnings
nyalldawson Apr 29, 2022
0cfe13d
Bump pat-s/always-upload-cache from 2.1.5 to 3.0.11
dependabot[bot] Nov 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/macos-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- uses: actions/checkout@v3

- name: Prepare build cache for pull request
uses: pat-s/always-upload-cache@v2.1.5
uses: pat-s/always-upload-cache@v3.0.11
if: github.event_name == 'pull_request'
with:
path: ${{ env.CCACHE_DIR }}
Expand All @@ -44,7 +44,7 @@ jobs:

- name: Prepare build cache for branch/tag
# use a fork of actions/cache@v2 to upload cache even when the build or test failed
uses: pat-s/always-upload-cache@v2.1.5
uses: pat-s/always-upload-cache@v3.0.11
if: github.event_name != 'pull_request'
with:
path: ${{ env.CCACHE_DIR }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/mingw64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
run: mkdir -p /w/.ccache/QGIS

- name: Prepare build cache for pull request
uses: pat-s/always-upload-cache@v2.1.5
uses: pat-s/always-upload-cache@v3.0.11
if: github.event_name == 'pull_request'
with:
path: /w/.ccache/QGIS
Expand All @@ -65,7 +65,7 @@ jobs:

- name: Prepare build cache for branch/tag
# use a fork of actions/cache@v2 to upload cache even when the build or test failed
uses: pat-s/always-upload-cache@v2.1.5
uses: pat-s/always-upload-cache@v3.0.11
if: github.event_name != 'pull_request'
with:
path: /w/.ccache/QGIS
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ogc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
uses: actions/checkout@v3

- name: Prepare build cache for pull request
uses: pat-s/always-upload-cache@v2.1.5
uses: pat-s/always-upload-cache@v3.0.11
if: github.event_name == 'pull_request'
with:
path: /home/runner/QGIS/.ccache
Expand All @@ -51,7 +51,7 @@ jobs:

- name: Prepare build cache for branch/tag
# use a fork of actions/cache@v2 to upload cache even when the build or test failed
uses: pat-s/always-upload-cache@v2.1.5
uses: pat-s/always-upload-cache@v3.0.11
if: github.event_name != 'pull_request'
with:
path: /home/runner/QGIS/.ccache
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ jobs:
docker push "qgis/qgis3-build-deps:${DOCKER_TAG}"

- name: Prepare build cache for pull request
uses: pat-s/always-upload-cache@v2.1.5
uses: pat-s/always-upload-cache@v3.0.11
if: github.event_name == 'pull_request'
with:
path: /home/runner/QGIS/.ccache
Expand All @@ -143,7 +143,7 @@ jobs:

- name: Prepare build cache for branch/tag
# use a fork of actions/cache@v2 to upload cache even when the build or test failed
uses: pat-s/always-upload-cache@v2.1.5
uses: pat-s/always-upload-cache@v3.0.11
if: github.event_name != 'pull_request'
with:
path: /home/runner/QGIS/.ccache
Expand Down
4 changes: 4 additions & 0 deletions src/core/qgsowsconnection.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,9 @@ QgsDataSourceUri QgsOwsConnection::uri() const

QgsDataSourceUri &QgsOwsConnection::addWmsWcsConnectionSettings( QgsDataSourceUri &uri, const QString &settingsKey )
{
Q_NOWARN_DEPRECATED_PUSH
addCommonConnectionSettings( uri, settingsKey );
Q_NOWARN_DEPRECATED_POP

const QgsSettings settings;
const QString referer = settings.value( settingsKey + "/referer" ).toString();
Expand Down Expand Up @@ -170,7 +172,9 @@ QgsDataSourceUri &QgsOwsConnection::addWmsWcsConnectionSettings( QgsDataSourceUr

QgsDataSourceUri &QgsOwsConnection::addWfsConnectionSettings( QgsDataSourceUri &uri, const QString &settingsKey )
{
Q_NOWARN_DEPRECATED_PUSH
addCommonConnectionSettings( uri, settingsKey );
Q_NOWARN_DEPRECATED_POP

const QgsSettings settings;
const QString version = settings.value( settingsKey + "/version" ).toString();
Expand Down