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.

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

Fix issue #1463 by restoring behavior --timeout parameter #1464

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
32e09c2
Updated 3rd party dependencies
tazmaniax Nov 13, 2023
1aac31e
Updated 3rd party dependencies
tazmaniax Dec 10, 2023
aa95484
Lock Python version to 3.11.x while dependency on imp exists
tazmaniax Dec 10, 2023
709a1cc
Removed Python dependency imp
tazmaniax Dec 10, 2023
d74460d
Removed Python imp dependency
tazmaniax Dec 10, 2023
76ae694
Add missing CR/LF at the bottom of the file
tazmaniax Dec 10, 2023
03ba7ea
Add missing CR/LF at the bottom of the file
tazmaniax Dec 10, 2023
aa8b722
Merge branch 'master' into dependencies_update_20231113
tazmaniax Dec 15, 2023
7db2627
Updated 3rd party dependencies
tazmaniax Dec 20, 2023
613aef1
Updated dependencies
tazmaniax Jan 30, 2024
b9181cd
Fix issue #1463 by restoring behavior --timeout parameter
Feb 9, 2024
3572b5c
#1457 feat(action): update action version:
xael-fry Feb 11, 2024
eb3670c
#1457 test!: disable i-am-a-developer for test
xael-fry Feb 11, 2024
19fa7db
#1457 fix(i-am-a-developer): fix test_jvm_version_flag
xael-fry Feb 11, 2024
8070e1e
The clock function was removed from time module in Python 3.8
osmanirosado Feb 15, 2024
6211a2f
#1457 fix(i-am-a-developer): deactivate ssl test for now
xael-fry Feb 26, 2024
55ca839
Merge pull request #1465 from xael-fry/1457_python-imp-module
xael-fry Feb 27, 2024
1b56237
Merge branch 'master' into dependencies_update_20231113
tazmaniax Feb 28, 2024
ff17d8c
Updated dependencies
tazmaniax Feb 28, 2024
998a13f
feat(YamlParser): add SafeConstructor to enforce security
xael-fry Feb 28, 2024
fad919e
Merge pull request #1469 from xael-fry/feat_safe_yaml_parser
xael-fry Mar 1, 2024
8266879
Merge pull request #1459 from tazmaniax/dependencies_update_20231113
xael-fry Mar 1, 2024
a9ed21f
Merge pull request #1467 from osmanirosado/master
xael-fry Mar 1, 2024
4f8c618
documentation(release): update documentation for release 1.8.0
xael-fry Mar 1, 2024
b80ed47
Merge pull request #1470 from xael-fry/prepare_release_1.8.0
xael-fry Mar 1, 2024
f21a039
Fix "play build-module" by replacing yaml.load with yaml.safe_load
Mar 2, 2024
e0916dd
Merge pull request #1472 from davidcostanzo/fix-build-module-1456
xael-fry Mar 3, 2024
8149c3a
feat(dependabot): add dependabot.yml configuration
xael-fry Mar 3, 2024
299aa97
feat(README): convert README from textile to markdown
xael-fry Mar 3, 2024
a92a108
fix(README): fix typo in README.md
xael-fry Mar 3, 2024
3cbf19e
Merge pull request #1474 from xael-fry/convert-readme-to-markdown
xael-fry Mar 3, 2024
5752e06
add release-drafter
xael-fry Mar 3, 2024
6e9856f
feat(codeql): add codeql config
xael-fry Mar 3, 2024
02c1de5
Merge branch 'master' into github-actions-configuration
xael-fry Mar 3, 2024
97b07a4
Merge pull request #1473 from xael-fry/github-actions-configuration
xael-fry Mar 3, 2024
e710cc7
Bump actions/setup-python from 4 to 5
dependabot[bot] Mar 3, 2024
59304ad
Bump actions/setup-java from 3 to 4
dependabot[bot] Mar 3, 2024
a6ca138
feat(github-actions): move release-drafter in workflows
xael-fry Mar 3, 2024
3a8e92c
feat(github-actions): add delete-caches.yml
xael-fry Mar 3, 2024
b1fafd7
feat(github-actions): change build-test condition
xael-fry Mar 3, 2024
5eece6e
Merge pull request #1475 from playframework/dependabot/github_actions…
xael-fry Mar 3, 2024
15ae54d
Merge pull request #1476 from playframework/dependabot/github_actions…
xael-fry Mar 3, 2024
f6f9d5a
Update issue templates
xael-fry Mar 3, 2024
3569830
Merge pull request #1477 from xael-fry/github-actions-configuration
xael-fry Mar 3, 2024
986cb02
feat(release-drafts): remove extends
xael-fry Mar 3, 2024
35e7be4
Merge pull request #1478 from playframework/xael-fry-patch-1
xael-fry Mar 3, 2024
c584ec1
fix(release-draft): fix version number
xael-fry Mar 3, 2024
6a07327
Merge pull request #1479 from xael-fry/xael-fry-patch-1
xael-fry Mar 3, 2024
3531486
Fix issue #1463 by restoring behavior --timeout parameter
Feb 9, 2024
83d656f
Fix some errors in testAutoTest due to recent function renaming.
Mar 11, 2024
1ebf839
Merge remote-tracking branch 'refs/remotes/origin/restore-timeout-146…
Mar 11, 2024
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
61 changes: 61 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
---
name: Bug report
about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

<!--

If you are reporting a bug, please be informative. This template can guide you to provide basic information, but you are not limited to that.

### Are you looking for help?

This is an issue tracker, used to manage and track the development of Play. It is not a support system and so it is not a place to ask questions or get help. If you're not sure if you have found a bug, or if you have a feature request, the best place to start is with either the [Play Forum](https://github.com/playframework/playframework/discussions) or [Stack Overflow](http://stackoverflow.com/questions/ask?tags=playframework).

-->

### Play Version

<!-- The Play version used -->


**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

or

Please provide a PR with a failing test.

If the issue is more complex or requires configuration, please provide a link to a project on Github that reproduces the issue.


**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]: Use `uname -a` if on Linux.
- Browser [e.g. chrome, safari]
- Version [e.g. 22]
- JDK [e.g 17]: Paste the output from `java -version` at the command line.

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
20 changes: 20 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
name: Feature request
about: Suggest an idea for this project
title: ''
labels: ''
assignees: ''

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
7 changes: 7 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: 2
updates:
- package-ecosystem: "github-actions" # See documentation for possible values
directory: "/" # Location of package manifests
schedule:
interval: "weekly"

41 changes: 41 additions & 0 deletions .github/release-drafts/increasing-minor-version.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name-template: 'Play $NEXT_MINOR_VERSION'
tag-template: '$NEXT_MINOR_VERSION'
template: |
# :mega: Play $NEXT_MINOR_VERSION Released

The Play Team is proud to announce the release of Play $NEXT_MINOR_VERSION. This release adds many new features and continues our efforts to make Play more modular, flexible, and secure. Play $NEXT_MINOR_VERSION is the result of more than **X months** of relentless work from our fantastic community, comprehending **more than a thousand (TODO?) changes** made from **X contributors**.

## :green_book: What is new?

The highlights in Play $NEXT_MINOR_VERSION include, but are not limited by:

To get started with Play, follow the instructions in our [Getting Started page](https://www.playframework.com/documentation/1.5.x/home#started).

## Full Changelog

Following pull requests got merged for this release:
<details>
<summary>Following pull requests got merged for this release (click to expand)</summary>

$CHANGES
</details>

For more details see the [full list of changes](https://github.com/playframework/play1/compare/$PREVIOUS_TAG...$NEXT_MINOR_VERSION/) and the [$NEXT_MINOR_VERSION milestone](https://github.com/playframework/play1/issues?page=1&q=milestone%3A%22$NEXT_MINOR_VERSION%22).

## :bow: Thanks to our contributors

Finally, thanks to the community for their help with detailed bug reports, discussions about new features and pull request reviews. This project is only possible due to the help we had from amazing contributors.
Special thanks to all code contributors who helped with this particular release (they are listed below)!


categories:
- title: '🚀 Features'
labels:
- 'feature'
- 'refactoring'
- title: '🐛 Bug Fixes'
label: 'bug'
- title: 📦 Dependency updates
label: 'dependencies'
- title: 📖 Documentation
label: 'documentation'
21 changes: 12 additions & 9 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
name: Pull Requests
name: Check

on:
pull_request: # Check Pull Requests

push:
pull_request:
branches:
- master # Check branch after merge

concurrency:
# Only run once for latest commit per ref and cancel other (previous) runs.
Expand All @@ -24,13 +27,13 @@ jobs:
name: Check / Tests -> JDK-${{ matrix.jdk }}/${{ matrix.os }}
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
# we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
fetch-depth: 0

- name: Set up python 3
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.x'
architecture: 'x64'
Expand All @@ -39,7 +42,7 @@ jobs:
- run: pip install -r python/requirements.txt

- name: Set up JDK ${{ matrix.jdk }}
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: ${{ matrix.jdk }}
distribution: 'adopt'
Expand All @@ -55,19 +58,19 @@ jobs:
name: BUILD ${{ github.sha }}
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
# we don't know what commit the last tag was it's safer to get entire repo so previousStableVersion resolves
fetch-depth: 0

- name: Set up python 3
uses: actions/setup-python@v3
uses: actions/setup-python@v5
with:
python-version: '3.x'
architecture: 'x64'

- name: Set up JDK 17
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: 17
distribution: 'adopt'
Expand All @@ -77,7 +80,7 @@ jobs:
run: ant artifact

- name: ziping artifact
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: play-${{ github.sha }}
if-no-files-found: error
Expand Down
58 changes: 58 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: "CodeQL"

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]
schedule:
- cron: '15 1 * * 6'

jobs:
analyze:
name: Analyze
# Runner size impacts CodeQL analysis time. To learn more, please see:
# - https://gh.io/recommended-hardware-resources-for-running-codeql
# - https://gh.io/supported-runners-and-hardware-resources
# - https://gh.io/using-larger-runners
# Consider using larger runners for possible analysis time improvements.
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
permissions:
# required for all workflows
security-events: write

# only required for workflows in private repositories
actions: read
contents: read

strategy:
fail-fast: false
matrix:
language: [ 'java-kotlin', 'javascript-typescript', 'python' ]

steps:
- name: Checkout repository
uses: actions/checkout@v4

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.

# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
# queries: security-extended,security-and-quality

- name: Build with Ant
if: ${{ matrix.language }} == 'java-kotlin'
working-directory: ./framework
run: ant jar

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
42 changes: 42 additions & 0 deletions .github/workflows/delete-caches.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Delete Caches
on:
schedule:
- cron: "0 */4 * * *" # Every 4th hour

concurrency:
# Only run once and cancel other (previous) runs.
group: delete-caches
cancel-in-progress: true

permissions:
actions: write # this permission is needed to delete cache

jobs:
delete-public-local-caches:
name: Delete unneeded caches
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: |
gh cache list --limit 500 --order asc --sort last_accessed_at | grep 'play-published-local' > caches.txt || true
echo "Found $(wc -l < caches.txt | xargs) published local cache entries"

current_time=$(date -u +%s)
expiration_time=$((current_time - 7200)) # 2 hour ago

echo "Current time is $(date -d @$current_time)"
echo "All entries hadn't been use from $(date -d @$expiration_time) will be delete"

while IFS=$'\t' read -r id name size created_at last_accessed_at; do
accessedTimestamp=$(date -u -d "$last_accessed_at" +%s)
# Uncomment to check on Mac OS
# accessedTimestamp=$(date -j -f "%Y-%m-%dT%H:%M:%SZ" "$last_accessed_at" +%s)
if [ "$accessedTimestamp" -lt "$expiration_time" ]; then
echo "Delete $id $name ($last_accessed_at)"
gh cache delete $id
fi
done < caches.txt
rm -rf caches.txt
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

23 changes: 23 additions & 0 deletions .github/workflows/release-drafter.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Release Drafter

on:
push:
branches:
- master

permissions: {}
jobs:
update_release_draft:
permissions:
pull-requests: write # to add label to PR (release-drafter/release-drafter)
contents: write # to create a github release (release-drafter/release-drafter)

runs-on: ubuntu-latest
steps:
- uses: release-drafter/release-drafter@v6
with:
name: "Play $RESOLVED_VERSION"
config-name: release-drafts/increasing-minor-version.yml # located in .github/ in the default branch within this or the .github repo
commitish: ${{ env.GITHUB_REF_NAME }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ samples-and-tests/i-am-a-developer/i-am-working-here
samples-and-tests/i-am-a-developer/i-am-creating-jobs-here
samples-and-tests/i-am-a-developer/i-am-testing-log-levels-here
samples-and-tests/i-am-a-developer/i-am-testing-ssl-config-here
samples-and-tests/i-am-a-developer/i-am-testing-auto-test-here
samples-and-tests/just-test-cases/attachments
samples-and-tests/booking/logs
samples-and-tests/booking/tmp
Expand Down
Loading
Loading