Fix deadlink and CI on schedule (#203)
* Update .dlc.json
* Update .dlc.json
* Fix boolean condition
* fix dlc
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* test
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* test
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* test
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* test
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* test
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* test
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* test
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* test
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* test
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* test
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* test
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* test without regex
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* fix regex
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* revert to apache
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* revert to apache
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* fix apache name
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* disable run for forks
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* disable run for forks
Signed-off-by: Superskyyy <superskyyy@outlook.com>
* disable run for forks
Signed-off-by: Superskyyy <superskyyy@outlook.com>
diff --git a/.dlc.json b/.dlc.json
index 3d8e27b..d666fce 100644
--- a/.dlc.json
+++ b/.dlc.json
@@ -10,6 +10,7 @@
"fallbackRetryDelay": "1000s",
"aliveStatusCodes": [
200,
- 401
+ 401,
+ 403
]
-}
\ No newline at end of file
+}
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
index be3c7a9..3f73fdf 100644
--- a/.github/workflows/CI.yaml
+++ b/.github/workflows/CI.yaml
@@ -15,7 +15,8 @@
# limitations under the License.
name: CI
-
+# This process will only run upon scheduled event on upstream master
+# or upon pull request when actual code or CI flow is changed
on:
pull_request:
push:
@@ -84,7 +85,9 @@
# prep step for plugin and unit test
name: Prepare Plugin and UT Matrix
needs: [ license-and-lint, changes ]
- if: github.event_name == 'schedule' || ${{ needs.changes.outputs.agent == 'true' }}
+ if: |
+ always() &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking-python') || needs.changes.outputs.agent == 'true')
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
@@ -99,7 +102,9 @@
# build docker image for plugin tests, with matrix of Python versions
name: Construct Agent Plugin Test Images
needs: [ license-and-lint, changes, prep-plugin-and-unit-tests ]
- if: github.event_name == 'schedule' || ${{ needs.changes.outputs.agent == 'true' }}
+ if: |
+ always() &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking-python') || needs.changes.outputs.agent == 'true')
runs-on: ubuntu-latest
strategy:
matrix: # may support pypy in the future
@@ -128,7 +133,9 @@
# this step is only run after passing building images + prep matrix + changes
name: Execute Agent Plugin and Unit Tests
needs: [ license-and-lint, changes, docker-plugin, prep-plugin-and-unit-tests ]
- if: github.event_name == 'schedule' || ${{ needs.changes.outputs.agent == 'true' }}
+ if: |
+ always() &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking-python') || needs.changes.outputs.agent == 'true')
runs-on: ubuntu-latest
timeout-minutes: 30
strategy:
@@ -164,7 +171,9 @@
# build docker image for E2E tests, single Python version for now.
name: Construct Agent E2E Test Images
needs: [ license-and-lint, changes ]
- if: github.event_name == 'schedule' || ${{ needs.changes.outputs.agent == 'true' }}
+ if: |
+ always() &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking-python') || needs.changes.outputs.agent == 'true')
runs-on: ubuntu-latest
timeout-minutes: 10
steps:
@@ -189,7 +198,9 @@
# execute E2E tests with SkyWalking-infra-e2e with a matrix of agent protocols
name: Basic function + ${{ matrix.case.name }} Transport (Python3.7)
needs: [ license-and-lint, changes, docker-e2e ]
- if: github.event_name == 'schedule' || ${{ needs.changes.outputs.agent == 'true' }}
+ if: |
+ always() &&
+ ((github.event_name == 'schedule' && github.repository == 'apache/skywalking-python') || needs.changes.outputs.agent == 'true')
runs-on: ubuntu-latest
timeout-minutes: 20
strategy:
diff --git a/.github/workflows/dead-link-checker.yaml b/.github/workflows/dead-link-checker.yaml
index 4d3fd12..5d31d13 100644
--- a/.github/workflows/dead-link-checker.yaml
+++ b/.github/workflows/dead-link-checker.yaml
@@ -33,10 +33,12 @@
CheckDeadLinks:
runs-on: ubuntu-latest
timeout-minutes: 30
+ if: (github.event_name == 'schedule' && github.repository == 'apache/skywalking-python') || (github.event_name != 'schedule')
steps:
- uses: actions/checkout@v3
- - run: sudo npm install -g markdown-link-check
- - run: |
- for file in $(find . -name "*.md"); do
- markdown-link-check -c .dlc.json -q "$file"
- done
+ - uses: gaurav-nelson/github-action-markdown-link-check@v1
+ with:
+ use-quiet-mode: 'no'
+ use-verbose-mode: 'yes'
+ config-file: '.dlc.json'
+ folder-path: 'docs/'
diff --git a/README.md b/README.md
index 1410e2a..9c64803 100755
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@
* Submit an [GitHub Issue](https://github.com/apache/skywalking/issues/new) by using [Python] as title prefix.
* Mail list: **dev@skywalking.apache.org**. Mail to `dev-subscribe@skywalking.apache.org`, follow the reply to subscribe the mail list.
* Join `skywalking` channel at [Apache Slack](http://s.apache.org/slack-invite). If the link is not working, find the latest one at [Apache INFRA WIKI](https://cwiki.apache.org/confluence/display/INFRA/Slack+Guest+Invites).
-* Twitter, [ASFSkyWalking](https://twitter.com/ASFSkyWalking)
+* Twitter, [ASFSkyWalking](https://twitter.com/AsfSkyWalking)
## License
Apache 2.0
diff --git a/docs/README.md b/docs/README.md
index a05ba71..1e91890 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -17,7 +17,7 @@
* Mail list: **dev@skywalking.apache.org**.
Mail to **dev-subscribe@skywalking.apache.org**, follow the reply to subscribe the mail list.
* Join `skywalking` channel by sending a request to the mail list - dev@skywalking.apache.org, we will invite you in.
-* Twitter - [ASFSkyWalking](https://twitter.com/ASFSkyWalking)
+* Twitter - [ASFSkyWalking](https://twitter.com/AsfSkyWalking)
## Contributing
diff --git a/tests/e2e/case/expected/logs-list.yml b/tests/e2e/case/expected/logs-list.yml
index 29d3a32..c8bfdc0 100644
--- a/tests/e2e/case/expected/logs-list.yml
+++ b/tests/e2e/case/expected/logs-list.yml
@@ -15,6 +15,9 @@
logs:
{{- contains .logs }}
+ # FIXME: issues/8752, now first entry is not verified at all
+ - e2e-placeholder: workaround-placeholder-for-e2e
+ placeholder: ISHOULDNOTEXIST
- servicename: e2e-service-provider
serviceid: {{ b64enc "e2e-service-provider" }}.1
serviceinstancename: provider1
@@ -24,8 +27,7 @@
traceid: {{ notEmpty .traceid }}
timestamp: {{ gt .timestamp 0 }}
contenttype: TEXT
- content: {{ regexp .content "(?s).+Leak basic auth info at https://example.com.+"}}
-
+ content: {{ regexp .content "(?s).+Leak basic auth info at https://example.com"}}
tags:
{{- contains .tags }}
- key: level
diff --git a/tests/e2e/script/env b/tests/e2e/script/env
index ae86a22..15cee8b 100644
--- a/tests/e2e/script/env
+++ b/tests/e2e/script/env
@@ -13,6 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-# 2022-03-25 commit
-SW_CTL_COMMIT=60cee4a926a867a7bd934b7f94c9a8517e141608
-SW_OAP_COMMIT=547f1ede2d1665601cb9d9a3853ed205620d6c83
+# 2022-04-23 commit
+SW_CTL_COMMIT=d2c95c3782f137518b09554331794c10e1457d95
+SW_OAP_COMMIT=3256b6c9d9b202ca676554ef2f1eac822c8a882f
