Skip to content

Commit

Permalink
Merge branch 'master' into IOAPPX-432_devPushAndroid
Browse files Browse the repository at this point in the history
# Conflicts:
#	package.json
  • Loading branch information
Vangaorth committed Dec 17, 2024
2 parents 4c181a8 + fd27f42 commit 7e25f84
Show file tree
Hide file tree
Showing 303 changed files with 37,646 additions and 29,512 deletions.
1 change: 0 additions & 1 deletion .env.local
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ ITW_EAA_PROVIDER_BASE_URL="https://pre.eaa.wallet.ipzs.it"
ITW_EAA_VERIFIER_BASE_URL="https://pre.verify.wallet.ipzs.it"
ITW_GOOGLE_CLOUD_PROJECT_NUMBER="260468725946"
ITW_ISSUANCE_REDIRECT_URI="https://wallet.io.pagopa.it/index.html"
ITW_ISSUANCE_REDIRECT_URI_CIE="iowalletcie://cb"
# Bypass the check that enforces the identity of the issued eID is the same as the authenticated user
ITW_BYPASS_IDENTITY_MATCH=YES
# Use the test environment for the IDP hint for both CIE and SPID
Expand Down
1 change: 0 additions & 1 deletion .env.production
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ ITW_EAA_PROVIDER_BASE_URL="https://eaa.wallet.ipzs.it"
ITW_EAA_VERIFIER_BASE_URL="https://verify.wallet.ipzs.it"
ITW_GOOGLE_CLOUD_PROJECT_NUMBER="260468725946"
ITW_ISSUANCE_REDIRECT_URI="https://wallet.io.pagopa.it/index.html"
ITW_ISSUANCE_REDIRECT_URI_CIE="iowalletcie://cb"
# Bypass the check that enforces the identity of the issued eID is the same as the authenticated user
ITW_BYPASS_IDENTITY_MATCH=NO
# Use the test environment for the IDP hint for both CIE and SPID
Expand Down
22 changes: 12 additions & 10 deletions .github/actions/setup-composite/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,24 @@ description: 'This action collects the steps to setup any job'
runs:
using: "composite"
steps:
- id: enable-corepack
shell: bash
run: corepack enable
- id: setup-node
uses: actions/setup-node@64ed1c7eab4cce3362f8c340dee64e5eaeef8f7c # v3.6.0
uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3.8.2
with:
node-version-file: '.node-version'
- id: yarn-cache-dir-path
run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT
shell: bash
- id: yarn-cache
uses: actions/cache@88522ab9f39a2ea568f7027eddc7d8d8bc9d59c8 # v3.3.1
env:
cache-name: cache-node-modules
with:
# npm cache files are stored in `~/.npm` on Linux/macOS
path: ~/.npm
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/yarn.lock') }}
- id: install-packages
path: |
**/node_modules
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('**/package.json') }}
restore-keys: |
${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
${{ runner.os }}-yarn-
- name: Install dependencies
if: steps.yarn-cache.outputs.cache-hit != 'true'
run: yarn install --frozen-lockfile
shell: bash
- id: generate-api-client
Expand Down
39 changes: 0 additions & 39 deletions .github/workflows/danger.yml

This file was deleted.

81 changes: 81 additions & 0 deletions .github/workflows/pr-title-linter-and-linker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
name: "Lint and Link PR title"

on:
pull_request:
types:
- opened
- edited
- reopened
- synchronize

jobs:
lint:
name: Validate PR title And link Jira Issue
runs-on: ubuntu-22.04
env:
JIRA_COMMENT_REGEX: "^.*Jira.*"
steps:
- uses: Slashgear/action-check-pr-title@860e8dc639f8e60335a6f5e8936ba67ed2536890 #v4.3.0
id: lint
with:
regexp: "\\[(#?[A-Z]*-[0-9]*,?){1,}\\]" # Regex the title should match.
continue-on-error: true

- name: Find Jira Comment
uses: peter-evans/find-comment@81e2da3af01c92f83cb927cf3ace0e085617c556 #v2
id: fc
with:
issue-number: ${{ github.event.pull_request.number }}
comment-author: "github-actions[bot]"
body-regex: "${{ env.JIRA_COMMENT_REGEX }}"

- name: Extract Jira Issue to Link
id: extract_jira_issue
if: steps.lint.outcome == 'success'
run: |
PR_TITLE=$(echo "${{ github.event.pull_request.title }}")
ISSUES_STR=$(awk -F'\\[|\\]' '{print $2}' <<< "$PR_TITLE" | sed "s/#//g")
IFS=',' read -ra ISSUES <<< "$ISSUES_STR"
JIRA_ISSUE=$(echo "${ISSUES[-1]}" | sed 's/^ *//;s/ *$//')
MARKDOWN_CARRIAGE_RETURN="<br>"
MARKDOWN_PREFIX="- Link to"
JIRA_COMMENT_MARKDOWN="This Pull Request refers to Jira issues:<br>"
if [[ ${#ISSUES[@]} -eq 1 ]]; then
JIRA_COMMENT_MARKDOWN="This Pull Request refers to the following Jira issue"
MARKDOWN_PREFIX=""
fi
for ISSUE in "${ISSUES[@]}"; do
ISSUE=$(echo "$ISSUE" | sed 's/^ *//;s/ *$//') # Trim spaces
JIRA_COMMENT_MARKDOWN+="$MARKDOWN_PREFIX [$ISSUE](https://pagopa.atlassian.net/browse/$ISSUE) $MARKDOWN_CARRIAGE_RETURN"
done
echo "JIRA_ISSUE=$JIRA_ISSUE" >> $GITHUB_ENV
echo "JIRA_COMMENT_MARKDOWN=$JIRA_COMMENT_MARKDOWN" >> $GITHUB_ENV
- name: Create Jira Link comment
if: steps.lint.outcome == 'success'
uses: peter-evans/create-or-update-comment@5adcb0bb0f9fb3f95ef05400558bdb3f329ee808 #v2
with:
comment-id: ${{ steps.fc.outputs.comment-id }}
issue-number: ${{ github.event.pull_request.number }}
body: |
## Jira Pull Request Link ##
${{ env.JIRA_COMMENT_MARKDOWN }}
edit-mode: replace
- name: Create Empty Jira Link comment
if: steps.lint.outcome != 'success'
uses: peter-evans/create-or-update-comment@5adcb0bb0f9fb3f95ef05400558bdb3f329ee808 #v2
with:
comment-id: ${{ steps.fc.outputs.comment-id }}
issue-number: ${{ github.event.pull_request.number }}
body: |
## Jira Pull request Link ##
It seems this Pull Request has no issues that refers to Jira!!!
Please check it out.
edit-mode: replace
- name: Failure message
if: steps.lint.outcome != 'success'
run: |
echo "Pull request title (${{ github.event.pull_request.title }}) is not properly formatted or it is not related to any Jira issue"
exit 1
13 changes: 9 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ DerivedData
*.hmap
*.ipa
*.xcuserstate
project.xcworkspace
**/.xcode.env.local

# Ruby / CocoaPods
/ios/Pods/
**/Pods/
/vendor/bundle/

# Android/IntelliJ
Expand Down Expand Up @@ -112,5 +112,10 @@ sentry.properties
# Temporary files created by Metro to check the health of the file watcher
.metro-health-check*

# yarn cache dir
.yarn/cache
# Yarn
.yarn/*
!.yarn/patches
!.yarn/plugins
!.yarn/releases
!.yarn/sdks
!.yarn/versions
874 changes: 874 additions & 0 deletions .yarn/releases/yarn-3.6.4.cjs

Large diffs are not rendered by default.

5 changes: 5 additions & 0 deletions .yarnrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
enableScripts: true

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-3.6.4.cjs
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,25 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [2.79.0-rc.11](https://github.com/pagopa/io-app/compare/2.79.0-rc.10...2.79.0-rc.11) (2024-12-13)


### Features

* **IT Wallet:** [[SIW-1901](https://pagopa.atlassian.net/browse/SIW-1901)] Deferred issuance for credential ([#6549](https://github.com/pagopa/io-app/issues/6549)) ([a6a7134](https://github.com/pagopa/io-app/commit/a6a71349f95d7b8cb01262d578ae83f9c25b74d1))


### Bug Fixes

* **IT Wallet:** [[SIW-1902](https://pagopa.atlassian.net/browse/SIW-1902)] Wallet accessibility improvements ([#6543](https://github.com/pagopa/io-app/issues/6543)) ([b4f9164](https://github.com/pagopa/io-app/commit/b4f9164ed190c6ecb9a8b510e5f648c2c86b32d4))


### Chores

* [[IOBP-1083](https://pagopa.atlassian.net/browse/IOBP-1083)] Update `IN_APP_BROWSER_CLOSED_BY_USER` outcome text ([#6548](https://github.com/pagopa/io-app/issues/6548)) ([47c6573](https://github.com/pagopa/io-app/commit/47c657388e9528327ac87d46337a52265c9ba439))
* [[IOCOM-1763](https://pagopa.atlassian.net/browse/IOCOM-1763)] Refactor of push notification engagement screen display logic ([#6464](https://github.com/pagopa/io-app/issues/6464)) ([9d41018](https://github.com/pagopa/io-app/commit/9d4101855ac25a51a959c1c2686eb7983768260d))
* **IT Wallet:** [[SIW-1909](https://pagopa.atlassian.net/browse/SIW-1909)] Move CIE logic from `@pagopa/io-react-native-wallet` to app ([#6542](https://github.com/pagopa/io-app/issues/6542)) ([f0bd90e](https://github.com/pagopa/io-app/commit/f0bd90e49de5307e550867a3ebd0a35cf9a208e4))

## [2.79.0-rc.10](https://github.com/pagopa/io-app/compare/2.79.0-rc.9...2.79.0-rc.10) (2024-12-12)


Expand Down
16 changes: 0 additions & 16 deletions Dangerfile.ts

This file was deleted.

7 changes: 3 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@ source "https://rubygems.org"
# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby '>=2.6.10'

# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
# bound in the template on Cocoapods with next React Native release.
gem 'cocoapods', '>= 1.13', '< 1.15'
# Exclude problematic versions of cocoapods and activesupport that causes build failures.
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
gem "fastlane", "~> 2.223.1"
gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
Loading

0 comments on commit 7e25f84

Please sign in to comment.