gitlab-ci: Work around miscalculation of deps with skipped jobs, take 2
Add more workarounds to those introduced in commit 592b4203 "Work around miscalculation of deps with skipped jobs", addressing https://gitlab.com/gitlab-org/gitlab/-/issues/213080
This commit should be reverted once the GitLab issue is fixed.