From 29bc8b0c389296388c284cc438b0e39eaccfa084 Mon Sep 17 00:00:00 2001
From: Maksim Kokryashkin <max.kokryashkin@gmail.com>
Date: Tue, 19 Dec 2023 11:50:41 +0300
Subject: [PATCH] more fixups

---
 .github/workflows/exotic-builds-testing.yml |  2 +-
 .github/workflows/tarantool-exotic.yml      |  6 ----
 .github/workflows/tarantool-packaging.yml   | 34 ---------------------
 3 files changed, 1 insertion(+), 41 deletions(-)
 delete mode 100644 .github/workflows/tarantool-packaging.yml

diff --git a/.github/workflows/exotic-builds-testing.yml b/.github/workflows/exotic-builds-testing.yml
index aa4cb2ca9f..8aaf154460 100644
--- a/.github/workflows/exotic-builds-testing.yml
+++ b/.github/workflows/exotic-builds-testing.yml
@@ -102,7 +102,7 @@ jobs:
       ${{ matrix.BUILDTYPE }}
       GC64:${{ matrix.GC64 }}
     needs: test-exotic
-    uses: tarantool/tarantool/.github/workflows/luajit-integration.yml@fckxorg/fckxorg/WIP-ci-integration-on-purpose-not-in-fork
+    uses: tarantool/tarantool/.github/workflows/luajit-integration.yml@fckxorg/WIP-ci-integration-on-purpose-not-in-fork
     with:
       CMAKE_EXTRA_PARAMS: >
         -G Ninja
diff --git a/.github/workflows/tarantool-exotic.yml b/.github/workflows/tarantool-exotic.yml
index 41fe80c87e..8fbc1a9a22 100644
--- a/.github/workflows/tarantool-exotic.yml
+++ b/.github/workflows/tarantool-exotic.yml
@@ -33,12 +33,6 @@ jobs:
       submodule: luajit
       revision: ${{ github.sha }}
 
-  test-tarantool-codeql:
-    uses: tarantool/tarantool/.github/workflows/codeql.yml@fckxorg/WIP-ci-integration-on-purpose-not-in-fork
-    with:
-      submodule: luajit
-      revision: ${{ github.sha }}
-
   test-tarantool-coverage:
     uses: tarantool/tarantool/.github/workflows/coverage.yml@fckxorg/WIP-ci-integration-on-purpose-not-in-fork
     with:
diff --git a/.github/workflows/tarantool-packaging.yml b/.github/workflows/tarantool-packaging.yml
deleted file mode 100644
index 23f0804008..0000000000
--- a/.github/workflows/tarantool-packaging.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Tarantool packaging
-
-on:
-  push:
-    branches-ignore:
-      - '**-notest'
-      - 'upstream-**'
-    tags-ignore:
-      - '**'
-
-concurrency:
-  # An update of a developer branch cancels the previously
-  # scheduled workflow run for this branch. However, the default
-  # branch, and long-term branch (tarantool/release/2.11,
-  # tarantool/release/2.10, etc) workflow runs are never canceled.
-  #
-  # We use a trick here: define the concurrency group as 'workflow
-  # run ID' + # 'workflow run attempt' because it is a unique
-  # combination for any run. So it effectively discards grouping.
-  #
-  # XXX: we cannot use `github.sha` as a unique identifier because
-  # pushing a tag may cancel a run that works on a branch push
-  # event.
-  group: ${{ startsWith(github.ref, 'refs/heads/tarantool/')
-    && format('LJ-{0}-{1}', github.run_id, github.run_attempt)
-    || format('LJ-{0}-{1}', github.workflow, github.ref) }}
-  cancel-in-progress: true
-
-jobs:
-  test-tarantool-packaging:
-    uses: tarantool/tarantool/.github/workflows/packaging.yml@fckxorg/WIP-ci-integration-on-purpose-not-in-fork
-    with:
-      submodule: luajit
-      revision: ${{ github.sha }}